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 85052d5873a87b199c40f3085e1378dddbd89acc..6c76df789c655867d1c04973fe40343327c1fbc1 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.cc |
+++ b/content/browser/renderer_host/render_view_host_impl.cc |
@@ -1181,8 +1181,14 @@ void RenderViewHostImpl::OnRequestMove(const gfx::Rect& pos) { |
Send(new ViewMsg_Move_ACK(GetRoutingID())); |
} |
-void RenderViewHostImpl::OnDocumentAvailableInMainFrame() { |
+void RenderViewHostImpl::OnDocumentAvailableInMainFrame( |
+ bool uses_temporary_zoom_level) { |
delegate_->DocumentAvailableInMainFrame(this); |
+ |
+ HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>( |
+ HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext())); |
+ host_zoom_map->SetUsesTemporaryZoomLevel( |
+ GetProcess()->GetID(), GetRoutingID(), uses_temporary_zoom_level); |
} |
void RenderViewHostImpl::OnToggleFullscreen(bool enter_fullscreen) { |
@@ -1591,17 +1597,14 @@ void RenderViewHostImpl::OnAccessibilityLocationChanges( |
} |
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 { |
- host_zoom_map->SetTemporaryZoomLevel( |
- GetProcess()->GetID(), GetRoutingID(), zoom_level); |
- } |
+ |
+ host_zoom_map->SetZoomLevelForView(GetProcess()->GetID(), |
+ GetRoutingID(), |
+ zoom_level, |
+ net::GetHostOrSpecFromURL(url)); |
} |
void RenderViewHostImpl::OnRunFileChooser(const FileChooserParams& params) { |