Zoom Extension API (chrome)

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 8cd337440a1443a2a048d6ba99b7108cc5965f7a..251c78721706061f33ebac644be006e16f7eb538 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -50,6 +50,8 @@
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_shelf.h"
+#include "chrome/browser/extensions/api/tabs/tabs_event_router.h"
+#include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ -1849,6 +1851,18 @@ void Browser::OnZoomChanged(content::WebContents* source,
   }
 }
 
+void Browser::OnZoomChangeInitiated(content::WebContents* web_contents,
+                                    double old_zoom_level,
+                                    double new_zoom_level,
+                                    ZoomMode zoom_mode) {
+  // TODO(wjmaclean) Is there any way we could hook the TabsEventRouter up

[Devlin, 2014/06/16 19:04:49]

Yes, this is bad.  There might be a good way to attach the router directly, and,
failing that, this type of forwarding should go on a class like TabHelper.

[wjmaclean, 2014/06/18 19:03:54]

Done.

This is a bit messy, since Browser is handling the OnZoomChange event, but we
want the OnZoomChangeInitiated event to go to TabsEventRouter. ZoomObserver
provides default (empty) implementations, so presumably it's ok for a derived
class to choose which events it wants to handle, but then ZoomController only
has support for a single observer.

I think it's reasonable to modify ZoomController to allow it to service multiple
observers, and then the only slightly-ugly piece is hooking up the
TabsEventRouter, which is still managed by Browser.

Let me know if this looks ok.

+  // directly as a ZoomObserver?
+  extensions::TabsWindowsAPI* tabs_windows_api =
+      extensions::TabsWindowsAPI::Get(web_contents->GetBrowserContext());
+  tabs_windows_api->tabs_event_router()->OnZoomChangeInitiated(
+      web_contents, old_zoom_level, new_zoom_level, zoom_mode);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ui::SelectFileDialog::Listener implementation: