mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: Chromium code style for enum classes (#26165)

Browse source
This commit is contained in:
Milan Burda 2020-10-27 18:51:45 +01:00 • committed by GitHub
parent dbf2931f0e
commit 1c99a9b425
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 300 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/browser/web_contents_zoom_controller.cc
View file

@ -44,14 +44,14 @@ void WebContentsZoomController::SetEmbedderZoomController(
void WebContentsZoomController::SetZoomLevel(double level) {
if (!web_contents()->GetRenderViewHost()->IsRenderViewLive() ||
blink::PageZoomValuesEqual(GetZoomLevel(), level) ||
zoom_mode_ == ZoomMode::DISABLED)
zoom_mode_ == ZoomMode::kDisabled)
return;
int render_process_id =
web_contents()->GetRenderViewHost()->GetProcess()->GetID();
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
if (zoom_mode_ == ZoomMode::MANUAL) {
if (zoom_mode_ == ZoomMode::kManual) {
zoom_level_ = level;
for (Observer& observer : observers_)
@ -62,7 +62,7 @@ void WebContentsZoomController::SetZoomLevel(double level) {
content::HostZoomMap* zoom_map =
content::HostZoomMap::GetForWebContents(web_contents());
if (zoom_mode_ == ZoomMode::ISOLATED ||
if (zoom_mode_ == ZoomMode::kIsolated ||
zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id, level);
// Notify observers of zoom level changes.
@ -78,7 +78,7 @@ void WebContentsZoomController::SetZoomLevel(double level) {
}
double WebContentsZoomController::GetZoomLevel() {
return zoom_mode_ == ZoomMode::MANUAL
return zoom_mode_ == ZoomMode::kManual
? zoom_level_
: content::HostZoomMap::GetZoomLevel(web_contents());
}
@ -120,7 +120,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
double original_zoom_level = GetZoomLevel();
switch (new_mode) {
case ZoomMode::DEFAULT: {
case ZoomMode::kDefault: {
content::NavigationEntry* entry =
web_contents()->GetController().GetLastCommittedEntry();
@ -148,11 +148,11 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
break;
}
case ZoomMode::ISOLATED: {
// Unless the zoom mode was |ZoomMode::DISABLED| before this call, the
case ZoomMode::kIsolated: {
// Unless the zoom mode was |ZoomMode::kDisabled| before this call, the
// page needs an initial isolated zoom back to the same level it was at
// in the other mode.
if (zoom_mode_ != ZoomMode::DISABLED) {
if (zoom_mode_ != ZoomMode::kDisabled) {
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
original_zoom_level);
} else {
@ -164,11 +164,11 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
}
break;
}
case ZoomMode::MANUAL: {
// Unless the zoom mode was |ZoomMode::DISABLED| before this call, the
case ZoomMode::kManual: {
// Unless the zoom mode was |ZoomMode::kDisabled| before this call, the
// page needs to be resized to the default zoom. While in manual mode,
// the zoom level is handled independently.
if (zoom_mode_ != ZoomMode::DISABLED) {
if (zoom_mode_ != ZoomMode::kDisabled) {
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
GetDefaultZoomLevel());
zoom_level_ = original_zoom_level;
@ -181,7 +181,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
}
break;
}
case ZoomMode::DISABLED: {
case ZoomMode::kDisabled: {
// The page needs to be zoomed back to default before disabling the zoom
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
GetDefaultZoomLevel());
@ -194,7 +194,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
const GURL& url) {
if (zoom_mode_ != ZoomMode::ISOLATED && zoom_mode_ != ZoomMode::MANUAL)
if (zoom_mode_ != ZoomMode::kIsolated && zoom_mode_ != ZoomMode::kManual)
return;
int render_process_id =
@ -208,7 +208,7 @@ void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
for (Observer& observer : observers_)
observer.OnZoomLevelChanged(web_contents(), new_zoom_level, false);
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
zoom_mode_ = ZoomMode::DEFAULT;
zoom_mode_ = ZoomMode::kDefault;
}
void WebContentsZoomController::DidFinishNavigation(