Remove ViewMsg_SetZoomLevel

content/browser/renderer_host/render_view_host_impl.cc

Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 562e611ef20b32b34f9be51c52c46bbbe411d5ac..18477b381cb3120ce6e5d3b345e3e79dbf40d628 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -202,7 +202,8 @@ RenderViewHostImpl::RenderViewHostImpl(
       render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING),
       virtual_keyboard_requested_(false),
       weak_factory_(this),
-      is_focused_element_editable_(false) {
+      is_focused_element_editable_(false),
+      uses_temporary_zoom_settings_(false) {
   DCHECK(instance_.get());
   CHECK(delegate_);  // http://crbug.com/82827
 
@@ -1010,6 +1011,8 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionRootBoundsChanged,
                         OnSelectionRootBoundsChanged)
 #endif
+    IPC_MESSAGE_HANDLER(ViewHostMsg_DidCreateDocument,
+                        OnDidCreateDocument)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
@@ -1607,17 +1610,21 @@ void RenderViewHostImpl::OnAccessibilityLocationChanges(
   }
 }
 
+void RenderViewHostImpl::OnDidCreateDocument(
+    bool uses_temporary_zoom_settings) {
+  uses_temporary_zoom_settings_ = uses_temporary_zoom_settings;
+}
+
 void RenderViewHostImpl::OnDidZoomURL(double zoom_level,
-                                      bool remember,
                                       const GURL& url) {
   HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
       HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext()));
-  if (remember) {
-    host_zoom_map->
-        SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level);
-  } else {
+  if (uses_temporary_zoom_settings_ ) {
     host_zoom_map->SetTemporaryZoomLevel(
         GetProcess()->GetID(), GetRoutingID(), zoom_level);

[Fady Samuel, 2014/05/15 23:26:53]

The flow of all this code can get pretty confusing pretty fast. I agree this
needs to get fixed. I'd like to see diagrams tomorrow.

[wjmaclean, 2014/05/16 01:57:08]

Agreed, it will be cleaner before it's done.

+  } else {
+    host_zoom_map->
+        SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level);
   }
 }