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

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 afa8dc8acb987552395d17f4c6b75160011322a3..cabde6ef1d23b11c876dda0918f6978204e186ae 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -3703,6 +3703,22 @@ void Browser::URLStarredChanged(TabContentsWrapper* source, bool starred) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// Browser, ZoomTabHelperDelegate implementation:
+
+void Browser::ZoomIconStateChanged(TabContentsWrapper *source,
+                                   ZoomTabHelper::ZoomIconState state,
+                                   int zoomPercent) {
+  if (source == GetSelectedTabContentsWrapper())
+    window_->SetZoomIconState(state, zoomPercent);
+}
+
+void Browser::ZoomChanged(TabContentsWrapper *source,
+                          int zoomPercent) {
+  if (source == GetSelectedTabContentsWrapper() && window_->IsActive())
+    window_->ShowZoomBubble(zoomPercent);
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // Browser, ExtensionTabHelperDelegate implementation:
 
 void Browser::OnDidGetApplicationInfo(TabContentsWrapper* source,
@@ -4183,6 +4199,9 @@ void Browser::UpdateCommandsForTabState() {
   // Page-related commands
   window_->SetStarredState(
       current_tab_wrapper->bookmark_tab_helper()->is_starred());
+  window_->SetZoomIconState(
+      current_tab_wrapper->zoom_tab_helper()->zoom_icon_status(),
+      current_tab_wrapper->zoom_tab_helper()->zoom_percent());
   command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
       current_tab->GetController().CanViewSource());
   command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION,
@@ -4679,6 +4698,7 @@ void Browser::SetAsDelegate(TabContentsWrapper* tab, Browser* delegate) {
   // ...and all the helpers.
   tab->blocked_content_tab_helper()->set_delegate(delegate);
   tab->bookmark_tab_helper()->set_delegate(delegate);
+  tab->zoom_tab_helper()->set_delegate(delegate);
   tab->constrained_window_tab_helper()->set_delegate(delegate);
   tab->core_tab_helper()->set_delegate(delegate);
   tab->extension_tab_helper()->set_delegate(delegate);