diff --git a/atom/browser/ui/webui/pdf_viewer_handler.cc b/atom/browser/ui/webui/pdf_viewer_handler.cc index 699119fb2802..ccebec9931b3 100644 --- a/atom/browser/ui/webui/pdf_viewer_handler.cc +++ b/atom/browser/ui/webui/pdf_viewer_handler.cc @@ -119,7 +119,7 @@ void PdfViewerHandler::Initialize(const base::ListValue* args) { } else { initialize_callback_id_ = callback_id->CreateDeepCopy(); } - + auto zoom_controller = WebContentsZoomController::FromWebContents( web_ui()->GetWebContents()); zoom_controller->SetZoomMode(WebContentsZoomController::ZOOM_MODE_MANUAL); @@ -211,7 +211,7 @@ void PdfViewerHandler::Reload(const base::ListValue* args) { void PdfViewerHandler::OnZoomLevelChanged(content::WebContents* web_contents, double level, bool is_temporary) { if (web_ui()->GetWebContents() == web_contents) { - CallJavascriptFunction("cr.webUIListenerCallback", + CallJavascriptFunction("cr.webUIListenerCallback", base::StringValue("onZoomLevelChanged"), base::Value(content::ZoomLevelToZoomFactor(level))); } diff --git a/atom/browser/ui/webui/pdf_viewer_handler.h b/atom/browser/ui/webui/pdf_viewer_handler.h index 46e7ac8d4edc..e6ae315e8764 100644 --- a/atom/browser/ui/webui/pdf_viewer_handler.h +++ b/atom/browser/ui/webui/pdf_viewer_handler.h @@ -43,7 +43,7 @@ class PdfViewerHandler : public content::WebUIMessageHandler, void SetZoom(const base::ListValue* args); void GetStrings(const base::ListValue* args); void Reload(const base::ListValue* args); - void OnZoomLevelChanged(content::WebContents* web_contents, double level, + void OnZoomLevelChanged(content::WebContents* web_contents, double level, bool is_temporary); std::unique_ptr initialize_callback_id_; diff --git a/atom/browser/web_contents_zoom_controller.cc b/atom/browser/web_contents_zoom_controller.cc index 764fa939784c..3c8d512b6bb4 100644 --- a/atom/browser/web_contents_zoom_controller.cc +++ b/atom/browser/web_contents_zoom_controller.cc @@ -67,7 +67,7 @@ void WebContentsZoomController::SetZoomLevel(double level) { content::HostZoomMap* zoom_map = content::HostZoomMap::GetForWebContents(web_contents()); - if (zoom_mode_ == ZOOM_MODE_ISOLATED || + 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); @@ -164,7 +164,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) { // 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, + observer.OnZoomLevelChanged(web_contents(), original_zoom_level, false); } break; @@ -181,7 +181,7 @@ void WebContentsZoomController::SetZoomMode(ZoomMode new_mode) { // 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, + observer.OnZoomLevelChanged(web_contents(), original_zoom_level, false); } break; @@ -211,7 +211,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, + observer.OnZoomLevelChanged(web_contents(), new_zoom_level, false); zoom_map->ClearTemporaryZoomLevel(render_process_id, render_view_id); zoom_mode_ = ZOOM_MODE_DEFAULT; diff --git a/atom/browser/web_contents_zoom_controller.h b/atom/browser/web_contents_zoom_controller.h index 493219c09410..220d5c45bfad 100644 --- a/atom/browser/web_contents_zoom_controller.h +++ b/atom/browser/web_contents_zoom_controller.h @@ -28,7 +28,7 @@ class WebContentsZoomController protected: virtual ~Observer() {} }; - + // Defines how zoom changes are handled. enum ZoomMode { // Results in default zoom behavior, i.e. zoom changes are handled @@ -67,7 +67,7 @@ class WebContentsZoomController // Sets the zoom mode, which defines zoom behavior (see enum ZoomMode). void SetZoomMode(ZoomMode zoom_mode); - + void ResetZoomModeOnNavigationIfNeeded(const GURL& url); ZoomMode zoom_mode() const { return zoom_mode_; }