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..eea74a0bf89c62d9180dfcdc57e63c0cb669e941 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"
@@ -2192,7 +2194,14 @@ void Browser::SetAsDelegate(WebContents* web_contents, Browser* delegate) {
   CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   SearchTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
-  ZoomController::FromWebContents(web_contents)->set_observer(delegate);
+
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  zoom_controller->AddObserver(delegate);
+  zoom_controller->AddObserver(
+      extensions::TabsWindowsAPI::Get(web_contents->GetBrowserContext())

[Devlin, 2014/06/19 21:15:29]

This still seems wrong to have here.

[wjmaclean, 2014/06/20 22:01:33]

It does turn out to be simpler to do this in the ZoomController constructor,
though then it begs the question of whether the old way (line 2195) shouldn't
move there too.

Let me know.

It also turns out that this function is sometimes called with delegate = NULL in
order to clear the delegates, but that doesn't work with continually calling
AddObserver. I've split this out into two separate functions that use a clearer
Add/Remove model.

+          ->tabs_event_router());
+
   ChromeTranslateClient* chrome_translate_client =
       ChromeTranslateClient::FromWebContents(web_contents);
   chrome_translate_client->translate_driver().set_observer(