Tracks changes to zoom icon and zoom percentage. Notifies browser window if the icon should be chan…

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 46ba61cd7af8162c330ab1cd451aa825a901b08f..9c800eab121afffd6471e6e56d1d906be9604d3a 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -40,6 +40,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
+#include "chrome/browser/ui/zoom/zoom_tab_helper_delegate.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -91,6 +92,7 @@ class Browser : public TabStripModelDelegate,
                 public ConstrainedWindowTabHelperDelegate,
                 public BlockedContentTabHelperDelegate,
                 public BookmarkTabHelperDelegate,
+                public ZoomTabHelperDelegate,

[Ben Goodger (Google), 2012/05/29 18:04:41]

rather than make Browser be the observer, and then have to wire the notification
through to the platform specific frontend bit, why not just have the specific
piece of platform frontend be the observer?

[Kyle Horimoto, 2012/05/31 23:13:52]

As discussed offline, if the Browser is not the observer, there doesn't seem to
be a way to change the icon when 1) A tab is pulled out of a window into it's
own window, 2) A tab is popped into an existing window, or 3) The active tab on
a single window changes. I'll keep this implementation unless we can find a
better way to do this.

                 public ExtensionTabHelperDelegate,
                 public content::PageNavigator,
                 public CommandUpdater::CommandUpdaterDelegate,
@@ -1011,6 +1013,13 @@ class Browser : public TabStripModelDelegate,
   virtual void URLStarredChanged(TabContentsWrapper* source,
                                  bool starred) OVERRIDE;
 
+  // Overridden from ZoomTabHelperDelegate:
+  virtual void ZoomIconStateChanged(TabContentsWrapper *source,
+                                    ZoomTabHelper::ZoomIconState state,
+                                    int zoomPercent) OVERRIDE;
+  virtual void ZoomChanged(TabContentsWrapper *source,
+                           int zoomPercent) OVERRIDE;
+
   // Overridden from ExtensionTabHelperDelegate:
   virtual void OnDidGetApplicationInfo(TabContentsWrapper* source,
                                        int32 page_id) OVERRIDE;