Original patch from issue 570048

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 964e29241e65f57823f9a33b789adc50a680cdc4..c69e109549ddc04a40d2ea8595abf90fca03b90f 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2524,6 +2524,16 @@ void RenderView::UpdateToggleSpellCheckCommandState() {
       checked_state));
 }
 
+void RenderView::ReportZoomLevelChanged(int request_id) {
+  bool remember = !webview()->mainFrame()->document().isPluginDocument();
+
+  // Tell the browser which url got zoomed so it can update the menu and the
+  // saved values if necessary
+  Send(new ViewHostMsg_DidZoomURL(
+      routing_id_, request_id, webview()->zoomLevel(), remember,
+      GURL(webview()->mainFrame()->url())));
+}
+
 void RenderView::StartNavStateSyncTimerIfNecessary() {
   int delay;
   if (send_content_state_immediately_)
@@ -4392,6 +4402,13 @@ void RenderView::OnFindReplyAck() {
   }
 }
 
+void RenderView::AddErrorToRootConsole(const string16& message) {
+  if (webview() && webview()->mainFrame()) {
+    webview()->mainFrame()->addMessageToConsole(
+        WebConsoleMessage(WebConsoleMessage::LevelError, message));
+  }
+}
+
 bool RenderView::AllowContentType(ContentSettingsType settings_type) {
   // CONTENT_SETTING_ASK is only valid for cookies.
   return current_content_settings_.settings[settings_type] !=
@@ -4483,15 +4500,10 @@ void RenderView::OnZoom(PageZoom::Function function) {
   zoomLevelChanged();
 }
 
-void RenderView::OnSetZoomLevel(double zoom_level) {
-  // Don't set zoom level for full-page plugin since they don't use the same
-  // zoom settings.
-  if (webview()->mainFrame()->document().isPluginDocument())
-    return;
-
+void RenderView::OnSetZoomLevel(int request_id, double zoom_level) {
   webview()->hidePopups();
   webview()->setZoomLevel(false, zoom_level);
-  zoomLevelChanged();
+  ReportZoomLevelChanged(request_id);
 }
 
 void RenderView::OnSetContentSettingsForLoadingURL(
@@ -5673,13 +5685,8 @@ void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) {
 }
 
 void RenderView::zoomLevelChanged() {
-  bool remember = !webview()->mainFrame()->document().isPluginDocument();
-
-  // Tell the browser which url got zoomed so it can update the menu and the
-  // saved values if necessary
-  Send(new ViewHostMsg_DidZoomURL(
-      routing_id_, webview()->zoomLevel(), remember,
-      GURL(webview()->mainFrame()->url())));
+  // Currently only extension zoom requests have a request id
+  ReportZoomLevelChanged(-1);
 }
 
 bool RenderView::IsNonLocalTopLevelNavigation(
@@ -5753,13 +5760,6 @@ void RenderView::OnSelectPopupMenuItem(int selected_index) {
 }
 #endif
 
-void RenderView::AddErrorToRootConsole(const string16& message) {
-  if (webview() && webview()->mainFrame()) {
-    webview()->mainFrame()->addMessageToConsole(
-        WebConsoleMessage(WebConsoleMessage::LevelError, message));
-  }
-}
-
 #if defined(ENABLE_FLAPPER_HACKS)
 void RenderView::OnConnectTcpACK(
     int request_id,