Remember zoom on a per-host basis....

chrome/browser/browser.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/gfx/point.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/extensions/crashed_extension_infobar.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_shelf_model.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/google_util.h"
+#include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ skipping 1063 matching lines @@
 void Browser::FindNext() {
   UserMetrics::RecordAction("FindNext", profile_);
   FindInPage(true, true);
 }
 
 void Browser::FindPrevious() {
   UserMetrics::RecordAction("FindPrevious", profile_);
   FindInPage(true, false);
 }
 
-void Browser::ZoomIn() {
-  UserMetrics::RecordAction("ZoomPlus", profile_);
-  GetSelectedTabContents()->render_view_host()->Zoom(PageZoom::LARGER);
-}
-
-void Browser::ZoomReset() {
-  UserMetrics::RecordAction("ZoomNormal", profile_);
-  GetSelectedTabContents()->render_view_host()->Zoom(PageZoom::STANDARD);
-}
-
-void Browser::ZoomOut() {
-  UserMetrics::RecordAction("ZoomMinus", profile_);
-  GetSelectedTabContents()->render_view_host()->Zoom(PageZoom::SMALLER);
+void Browser::Zoom(PageZoom::Function zoom_function) {
+  static const char* kActions[] = { "ZoomMinus", "ZoomNormal", "ZoomPlus" };
+  UserMetrics::RecordComputedAction(
+      kActions[zoom_function - PageZoom::ZOOM_OUT], profile_);
+  TabContents* tab_contents = GetSelectedTabContents();
+  tab_contents->render_view_host()->Zoom(zoom_function);
 }
 
 void Browser::FocusToolbar() {
   UserMetrics::RecordAction("FocusToolbar", profile_);
   window_->FocusToolbar();
 }
 
 void Browser::FocusLocationBar() {
   UserMetrics::RecordAction("FocusLocation", profile_);
   window_->SetFocusToLocationBar();
@@ skipping 364 matching lines @@
     case IDC_COPY:                  Copy();                        break;
     case IDC_PASTE:                 Paste();                       break;
 #endif
 
     // Find-in-page
     case IDC_FIND:                  Find();                        break;
     case IDC_FIND_NEXT:             FindNext();                    break;
     case IDC_FIND_PREVIOUS:         FindPrevious();                break;
 
     // Zoom
-    case IDC_ZOOM_PLUS:             ZoomIn();                      break;
-    case IDC_ZOOM_NORMAL:           ZoomReset();                   break;
-    case IDC_ZOOM_MINUS:            ZoomOut();                     break;
+    case IDC_ZOOM_PLUS:             Zoom(PageZoom::ZOOM_IN);       break;
+    case IDC_ZOOM_NORMAL:           Zoom(PageZoom::RESET);         break;
+    case IDC_ZOOM_MINUS:            Zoom(PageZoom::ZOOM_OUT);      break;
 
     // Focus various bits of UI
     case IDC_FOCUS_TOOLBAR:         FocusToolbar();                break;
     case IDC_FOCUS_LOCATION:        FocusLocationBar();            break;
     case IDC_FOCUS_SEARCH:          FocusSearch();                 break;
 
     // Show various bits of UI
     case IDC_OPEN_FILE:             OpenFile();                    break;
     case IDC_CREATE_SHORTCUTS:      OpenCreateShortcutsDialog();   break;
     case IDC_DEV_TOOLS:             ToggleDevToolsWindow(false);   break;
@@ skipping 1535 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }