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

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 1713 matching lines @@
 // Browser, BookmarkTabHelperDelegate implementation:
 
 void Browser::URLStarredChanged(TabContents* source, bool starred) {
   if (source == chrome::GetActiveTabContents(this))
     window_->SetStarredState(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.)

   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const FilePath& path, int index, void* params) {
   profile_->set_last_selected_directory(path.DirName());
   GURL file_url = net::FilePathToFileURL(path);
 
@@ skipping 516 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }