Refactor browser window zoom handling and enable zoom icon on all platforms.

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 d97dc29d64f3d8ffe0c59e5098fb9808912dd02a..fb443ce4c47747aa9c3dff074b50040b8f57152e 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1731,21 +1731,10 @@ void Browser::URLStarredChanged(TabContents* source, bool starred) {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, ZoomObserver implementation:
 
-void Browser::OnZoomIconChanged(TabContents* source,
-                                ZoomController::ZoomIconState state) {
-  if (source == chrome::GetActiveTabContents(this))
-    window_->SetZoomIconState(state);
-}
-
-void Browser::OnZoomChanged(TabContents* source,
-                            int zoom_percent,
-                            bool can_show_bubble) {
+void Browser::OnZoomChanged(TabContents* source, bool can_show_bubble) {
   if (source == chrome::GetActiveTabContents(this)) {
-    window_->SetZoomIconTooltipPercent(zoom_percent);
-
     // Only show the zoom bubble for zoom changes in the active window.
-    if (can_show_bubble && window_->IsActive())
-      window_->ShowZoomBubble(zoom_percent);
+    window_->ZoomChangedForActiveTab(can_show_bubble && window_->IsActive());

[Kyle Horimoto, 2012/07/24 20:08:11]

Also, is there a better method name we can think of? Because I wrote a lot of
this code, I understand that "ActiveTab" means the whatever is the current tab
being displayed in the browser window, regardless of whether that window is
active or not. However, I can definitely see someone unfamiliar with the code
not realizing that this method will also be called on windows that are not the
active window.

[Evan Stade, 2012/07/24 20:12:49]

I think it's fine because "active" is the term that's used throughout Browser
and BrowserWindow code to refer to "foreground". (Although foreground is even
better.)

   }
 }