Zoom Extension API (chrome)

chrome/browser/chrome_page_zoom.cc

Index: chrome/browser/chrome_page_zoom.cc
diff --git a/chrome/browser/chrome_page_zoom.cc b/chrome/browser/chrome_page_zoom.cc
index 6e534d90ca5aea983d8e9af10e94aae5c0085014..135305e92f217fbcb5c0112a8a31ddc2f8f9f8f1 100644
--- a/chrome/browser/chrome_page_zoom.cc
+++ b/chrome/browser/chrome_page_zoom.cc
@@ -10,6 +10,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_page_zoom_constants.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/render_view_host.h"
@@ -66,13 +67,17 @@ std::vector<double> PresetZoomLevels(double custom_level) {
 }
 
 void Zoom(content::WebContents* web_contents, content::PageZoom zoom) {
-  double current_zoom_level = content::HostZoomMap::GetZoomLevel(web_contents);
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+
+  double current_zoom_level = zoom_controller->GetZoomLevel();
   double default_zoom_level =
       Profile::FromBrowserContext(web_contents->GetBrowserContext())->
           GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
 
   if (zoom == content::PAGE_ZOOM_RESET) {
-    content::HostZoomMap::SetZoomLevel(web_contents, default_zoom_level);
+    // TODO(wjmaclean) Should we be talking to HostZoomMap directly instead?

[Fady Samuel, 2014/06/12 19:46:57]

Remove comment?

+    zoom_controller->SetZoomLevel(default_zoom_level);
     content::RecordAction(UserMetricsAction("ZoomNormal"));
     return;
   }
@@ -90,7 +95,8 @@ void Zoom(content::WebContents* web_contents, content::PageZoom zoom) {
       if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
         continue;
       if (zoom_level < current_zoom_level) {
-        content::HostZoomMap::SetZoomLevel(web_contents, zoom_level);
+        // TODO(wjmaclean) Should we be talking to HostZoomMap directly instead?

[Fady Samuel, 2014/06/12 19:46:57]

Remove comment.

+        zoom_controller->SetZoomLevel(zoom_level);
         content::RecordAction(UserMetricsAction("ZoomMinus"));
         return;
       }
@@ -105,7 +111,8 @@ void Zoom(content::WebContents* web_contents, content::PageZoom zoom) {
       if (content::ZoomValuesEqual(zoom_level, current_zoom_level))
         continue;
       if (zoom_level > current_zoom_level) {
-        content::HostZoomMap::SetZoomLevel(web_contents, zoom_level);
+        // TODO(wjmaclean) Should we be talking to HostZoomMap directly instead?

[Fady Samuel, 2014/06/12 19:46:57]

Remove comment.

+        zoom_controller->SetZoomLevel(zoom_level);
         content::RecordAction(UserMetricsAction("ZoomPlus"));
         return;
       }