Changes to content/ to facilitate new zoom extension API

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3268 matching lines @@
       zoom_level = static_cast<int>(old_zoom_level + zoom);
     } else {
       // We're going towards 100%, so first go to the next whole number.
       zoom_level = static_cast<int>(old_zoom_level);
     }
   }
   webview()->setZoomLevel(zoom_level);
   zoomLevelChanged();
 }
 
-void RenderViewImpl::OnSetZoomLevel(double zoom_level) {
+void RenderViewImpl::OnSetZoomLevel(int zoom_id,
+                                    double zoom_level,
+                                    content::ZoomMode zoom_mode) {
   webview()->hidePopups();
-  webview()->setZoomLevel(zoom_level);
-  zoomLevelChanged();
+  if (zoom_mode != content::kZoomModeManual) {
+    webview()->setZoomLevel(zoom_level);
+  }
+  zoomLevelChanged(zoom_id, zoom_level, zoom_mode == content::kZoomModeDefault);
 }
 
 void RenderViewImpl::OnSetZoomLevelForLoadingURL(const GURL& url,
                                                  double zoom_level) {
 #if !defined(OS_ANDROID)
   // On Android, page zoom isn't used, and in case of WebView, text zoom is used
   // for legacy WebView text scaling emulation. Thus, the code that resets
   // the zoom level from this map will be effectively resetting text zoom level.
   host_zoom_levels_[url] = zoom_level;
 #endif
@@ skipping 1032 matching lines @@
   int minimum_percent = static_cast<int>(
       ZoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       ZoomLevelToZoomFactor(maximum_level) * 100);
 
   Send(new ViewHostMsg_UpdateZoomLimits(
       routing_id_, minimum_percent, maximum_percent, remember));
 }
 
 void RenderViewImpl::zoomLevelChanged() {
-  bool remember = !webview()->mainFrame()->document().isPluginDocument();
-  float zoom_level = webview()->zoomLevel();
+  zoomLevelChanged(0, webview()->zoomLevel(), false);
+}
+
+void RenderViewImpl::zoomLevelChanged(int zoom_id, double zoom_level,
+                                      bool remember) {
+  remember = remember && !webview()->mainFrame()->document().isPluginDocument();
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, ZoomLevelChanged());
 
   // 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_, zoom_level, remember,
+      routing_id_, zoom_id, zoom_level, remember,
       GURL(webview()->mainFrame()->document().url())));
 }
 
 double RenderViewImpl::zoomLevelToZoomFactor(double zoom_level) const {
   return ZoomLevelToZoomFactor(zoom_level);
 }
 
 double RenderViewImpl::zoomFactorToZoomLevel(double factor) const {
   return ZoomFactorToZoomLevel(factor);
 }
@@ skipping 398 matching lines @@
     std::vector<gfx::Size> sizes(icon_urls[i].sizes().size());
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content