Move command handling and updating off Browser and onto a helper object.

chrome/browser/ui/views/toolbar_view.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/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/search/search_types.h"
@@ skipping 120 matching lines @@
       reload_(NULL),
       home_(NULL),
       location_bar_(NULL),
       location_bar_container_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       browser_(browser),
       profiles_menu_contents_(NULL) {
   set_id(VIEW_ID_TOOLBAR);
 
-  browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
-  browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
-  browser_->command_updater()->AddCommandObserver(IDC_RELOAD, this);
-  browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
-  browser_->command_updater()->AddCommandObserver(IDC_LOAD_NEW_TAB_PAGE, this);
+  chrome::AddCommandObserver(browser_, IDC_BACK, this);
+  chrome::AddCommandObserver(browser_, IDC_FORWARD, this);
+  chrome::AddCommandObserver(browser_, IDC_RELOAD, this);
+  chrome::AddCommandObserver(browser_, IDC_HOME, this);
+  chrome::AddCommandObserver(browser_, IDC_LOAD_NEW_TAB_PAGE, this);
 
   display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     kPopupBackgroundEdge = rb.GetImageSkiaNamed(IDR_LOCATIONBG_POPUPMODE_EDGE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
@@ skipping 43 matching lines @@
   forward_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD));
   forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD));
   forward_->set_id(VIEW_ID_FORWARD_BUTTON);
 
   // Have to create this before |reload_| as |reload_|'s constructor needs it.
   location_bar_container_ = new LocationBarContainer(
       location_bar_parent,
       chrome::search::IsInstantExtendedAPIEnabled(browser_->profile()));
   location_bar_ = new LocationBarView(
       browser_->profile(),
-      browser_->command_updater(),
+      browser_->command_controller()->command_updater(),
       model_,
       this,
       (display_mode_ == DISPLAYMODE_LOCATION) ?
           LocationBarView::POPUP : LocationBarView::NORMAL);
   // TODO(sky): if we want this to work on windows we need to make sure the
   // LocationBarContainer gets focus. This will involve tweaking view_ids.
   // location_bar_->set_view_to_focus(location_bar_container_);
   location_bar_container_->SetLocationBarView(location_bar_);
 
-  reload_ = new ReloadButton(location_bar_, browser_->command_updater());
+  reload_ = new ReloadButton(location_bar_,
+                             browser_->command_controller()->command_updater());
   reload_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                        ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);
   reload_->SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_RELOAD));
   reload_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_RELOAD));
   reload_->set_id(VIEW_ID_RELOAD_BUTTON);
 
   home_ = new views::ImageButton(this);
   home_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                      ui::EF_MIDDLE_MOUSE_BUTTON);
@@ skipping 222 matching lines @@
   // view based on toolbar mode change.
   if (mode.is_ntp())
     location_bar_->Layout();
 
   Layout();
   LayoutForSearch();
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ToolbarView, CommandUpdater::CommandObserver implementation:
+// ToolbarView, CommandObserver implementation:
 
 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) {
   // Special case the reload button at the NTP for extended instant.
   if (id == IDC_RELOAD &&
       chrome::search::IsInstantExtendedAPIEnabled(browser_->profile()) &&
       browser_->search_model()->mode().is_ntp()) {
     reload_->SetEnabled(false);
     return;
   }
 
@@ skipping 21 matching lines @@
   int command = sender->tag();
   WindowOpenDisposition disposition =
       browser::DispositionFromEventFlags(sender->mouse_event_flags());
   if ((disposition == CURRENT_TAB) &&
       ((command == IDC_BACK) || (command == IDC_FORWARD))) {
     // Forcibly reset the location bar, since otherwise it won't discard any
     // ongoing user edits, since it doesn't realize this is a user-initiated
     // action.
     location_bar_->Revert();
   }
-  browser_->ExecuteCommandWithDisposition(command, disposition);
+  chrome::ExecuteCommandWithDisposition(browser_, command, disposition);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, content::NotificationObserver implementation:
 
 void ToolbarView::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_PREF_CHANGED: {
@@ skipping 163 matching lines @@
                                       available_width, available_height);
 
   // In NTP mode, the location bar needs content area's bounds to layout within
   // it, so we skip doing that here. When the browser view finished setting the
   // tab content bounds, we then layout the NTP location bar over it.
   const chrome::search::Mode& si_mode(browser_->search_model()->mode());
   if (si_mode.is_ntp()) {
     // Force the reload button to go into disabled mode to display the grey
     // circle and not the grey cross. The disabled reload state only exists for
     // ntp pages.
-    browser_->command_updater()->UpdateCommandEnabled(IDC_RELOAD, false);
+    chrome::UpdateCommandEnabled(browser_, IDC_RELOAD, false);
   } else {
     // Start the location bar animation.
     if (si_mode.animate && si_mode.is_search() &&
         !location_bar_container_->IsAnimating()) {
       gfx::Point location_bar_origin(location_bar_bounds.origin());
       views::View::ConvertPointToView(this, location_bar_container_->parent(),
                                       &location_bar_origin);
       location_bar_container_->AnimateTo(
           gfx::Rect(location_bar_origin, location_bar_bounds.size()));
     } else {
       SetLocationBarContainerBounds(location_bar_bounds);
     }
-    browser_->command_updater()->UpdateCommandEnabled(IDC_RELOAD, true);
+    chrome::UpdateCommandEnabled(browser_, IDC_RELOAD, true);
   }
 
   browser_actions_->SetBounds(location_bar_bounds.right(), 0,
                               browser_actions_width, height());
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
   // SetBounds does not do a layout at all.
   // TODO(sidchat): Rework the above behavior so that explicit layout is not
@@ skipping 268 matching lines @@
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToView(this, location_bar_container_->parent(),
                                   &origin);
   gfx::Rect target_bounds(origin, bounds.size());
   if (location_bar_container_->GetTargetBounds() != target_bounds) {
     location_bar_container_->SetInToolbar(true);
     location_bar_container_->SetBoundsRect(target_bounds);
   }
 }