Zoom Extension API (chrome)

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 2b2d50f583508076255437dee2332c6c4dc20af9..dd43eb76319097bcc39990ecf6c3f0561f425a72 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -33,6 +33,8 @@
 #include "chrome/browser/ui/toolbar/bookmark_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
+#include "chrome/browser/ui/zoom/zoom_event_manager.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -282,7 +284,12 @@ WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
   Build(is_new_menu);
   UpdateZoomControls();
 
-  zoom_subscription_ = HostZoomMap::GetForBrowserContext(
+  content_zoom_subscription_ = content::HostZoomMap::GetForBrowserContext(
+      browser->profile())->AddZoomLevelChangedCallback(
+          base::Bind(&WrenchMenuModel::OnZoomLevelChanged,
+                     base::Unretained(this)));
+
+  browser_zoom_subscription_ = ZoomEventManager::GetForBrowserContext(
       browser->profile())->AddZoomLevelChangedCallback(
           base::Bind(&WrenchMenuModel::OnZoomLevelChanged,
                      base::Unretained(this)));

[sky, 2014/06/24 16:23:41]

What is the difference between what this function does and that on 287?

[wjmaclean, 2014/06/24 18:04:07]

Nothing, except the source of the events. I originally tried to create a model
where all events from HostZoomMap flowed through ZoomEventManager so that
observers only ever saw one source of events, but since there are no guarantees
on the order in which UserData objects are destroyed I ran into problems
guaranteeing the order of destruction, and this led to DCHECKs firing when
HostZoomMap was destroyed with subscriptions still active.

If there's a way to guarantee that ZoomEventManager is destroyed first (e.g. if
UserData is destroyed in the reverse order than it is created), then we could go
back to that model.

@@ -783,13 +790,11 @@ void WrenchMenuModel::CreateZoomMenu(bool new_menu) {
 }
 
 void WrenchMenuModel::UpdateZoomControls() {
-  bool enable_increment = false;
-  bool enable_decrement = false;
   int zoom_percent = 100;
   if (browser_->tab_strip_model()->GetActiveWebContents()) {
-    zoom_percent =
-        browser_->tab_strip_model()->GetActiveWebContents()->GetZoomPercent(
-            &enable_increment, &enable_decrement);
+    zoom_percent = ZoomController::FromWebContents(
+                       browser_->tab_strip_model()->GetActiveWebContents())
+                       ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));