also format missing .cc files
This commit is contained in:
parent
53bdf22c85
commit
c6f4bbd143
181 changed files with 4102 additions and 4254 deletions
|
@ -71,8 +71,7 @@ void WebContentsZoomController::SetZoomLevel(double level) {
|
|||
content::HostZoomMap::GetForWebContents(web_contents());
|
||||
if (zoom_mode_ == ZOOM_MODE_ISOLATED ||
|
||||
zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
|
||||
zoom_map->SetTemporaryZoomLevel(
|
||||
render_process_id, render_view_id, level);
|
||||
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id, level);
|
||||
// Notify observers of zoom level changes.
|
||||
for (Observer& observer : observers_)
|
||||
observer.OnZoomLevelChanged(web_contents(), level, true);
|
||||
|
@ -116,7 +115,6 @@ bool WebContentsZoomController::UsesTemporaryZoomLevel() {
|
|||
render_view_id);
|
||||
}
|
||||
|
||||
|
||||
void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
|
||||
if (new_mode == zoom_mode_)
|
||||
return;
|
||||
|
@ -169,7 +167,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
|
|||
// manually.
|
||||
for (Observer& observer : observers_)
|
||||
observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
|
||||
false);
|
||||
false);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -178,22 +176,22 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
|
|||
// page needs to be resized to the default zoom. While in manual mode,
|
||||
// the zoom level is handled independently.
|
||||
if (zoom_mode_ != ZOOM_MODE_DISABLED) {
|
||||
zoom_map->SetTemporaryZoomLevel(
|
||||
render_process_id, render_view_id, GetDefaultZoomLevel());
|
||||
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
||||
GetDefaultZoomLevel());
|
||||
zoom_level_ = original_zoom_level;
|
||||
} else {
|
||||
// When we don't call any HostZoomMap set functions, we send the event
|
||||
// manually.
|
||||
for (Observer& observer : observers_)
|
||||
observer.OnZoomLevelChanged(web_contents(), original_zoom_level,
|
||||
false);
|
||||
false);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ZOOM_MODE_DISABLED: {
|
||||
// The page needs to be zoomed back to default before disabling the zoom
|
||||
zoom_map->SetTemporaryZoomLevel(
|
||||
render_process_id, render_view_id, GetDefaultZoomLevel());
|
||||
zoom_map->SetTemporaryZoomLevel(render_process_id, render_view_id,
|
||||
GetDefaultZoomLevel());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -201,7 +199,6 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) {
|
|||
zoom_mode_ = new_mode;
|
||||
}
|
||||
|
||||
|
||||
void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
|
||||
const GURL& url) {
|
||||
if (zoom_mode_ != ZOOM_MODE_ISOLATED && zoom_mode_ != ZOOM_MODE_MANUAL)
|
||||
|
@ -216,8 +213,7 @@ void WebContentsZoomController::ResetZoomModeOnNavigationIfNeeded(
|
|||
double new_zoom_level = zoom_map->GetZoomLevelForHostAndScheme(
|
||||
url.scheme(), net::GetHostOrSpecFromURL(url));
|
||||
for (Observer& observer : observers_)
|
||||
observer.OnZoomLevelChanged(web_contents(), new_zoom_level,
|
||||
false);
|
||||
observer.OnZoomLevelChanged(web_contents(), new_zoom_level, false);
|
||||
zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id);
|
||||
zoom_mode_ = ZOOM_MODE_DEFAULT;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue