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

chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 101 matching lines @@
 bool EncodingMenuModel::IsCommandIdChecked(int command_id) const {
   WebContents* current_tab = browser_->GetActiveWebContents();
   if (!current_tab)
     return false;
   EncodingMenuController controller;
   return controller.IsItemChecked(browser_->profile(),
                                   current_tab->GetEncoding(), command_id);
 }
 
 bool EncodingMenuModel::IsCommandIdEnabled(int command_id) const {
-  bool enabled = browser_->command_updater()->IsCommandEnabled(command_id);
+  bool enabled = chrome::IsCommandEnabled(browser_, command_id);
   // Special handling for the contents of the Encoding submenu. On Mac OS,
   // instead of enabling/disabling the top-level menu item, the submenu's
   // contents get disabled, per Apple's HIG.
 #if defined(OS_MACOSX)
-  enabled &= browser_->command_updater()->IsCommandEnabled(IDC_ENCODING_MENU);
+  enabled &= chrome::IsCommandEnabled(browser_, IDC_ENCODING_MENU);
 #endif
   return enabled;
 }
 
 bool EncodingMenuModel::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void EncodingMenuModel::ExecuteCommand(int command_id) {
-  browser_->ExecuteCommand(command_id);
+  chrome::ExecuteCommand(browser_, command_id);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ZoomMenuModel
 
 ZoomMenuModel::ZoomMenuModel(ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   Build();
 }
 
@@ skipping 185 matching lines @@
     SyncGlobalError* error = service->sync_global_error();
     if (error && error->HasCustomizedSyncMenuItem()) {
       error->ExecuteMenuItem(browser_);
       return;
     }
   }
 
   if (command_id == IDC_HELP_PAGE_VIA_MENU)
     content::RecordAction(UserMetricsAction("ShowHelpTabViaWrenchMenu"));
 
-  browser_->ExecuteCommand(command_id);
+  chrome::ExecuteCommand(browser_, command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdChecked(int command_id) const {
   if (command_id == IDC_SHOW_BOOKMARK_BAR) {
     return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   } else if (command_id == IDC_PROFILING_ENABLED) {
     return Profiling::BeingProfiled();
   }
 
   return false;
 }
 
 bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
   GlobalError* error = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetGlobalErrorByMenuItemCommandID(command_id);
   if (error)
     return true;
 
-  return browser_->command_updater()->IsCommandEnabled(command_id);
+  return chrome::IsCommandEnabled(browser_, command_id);
 }
 
 bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
 #if defined(OS_WIN)
   if (command_id == IDC_VIEW_INCOMPATIBILITIES) {
     EnumerateModulesModel* loaded_modules =
         EnumerateModulesModel::GetInstance();
     if (loaded_modules->confirmed_bad_modules_detected() <= 0)
       return false;
     loaded_modules->AcknowledgeConflictNotification();
@@ skipping 244 matching lines @@
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(
       ProfileSyncServiceFactory::GetForProfile(profile),
       *SigninManagerFactory::GetForProfile(profile));
 }