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

chrome/browser/automation/automation_provider.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/automation/automation_provider.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 28 matching lines @@
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/automation_constants.h"
@@ skipping 494 matching lines @@
                                           bool* success) {
   *success = false;
   if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* nav = tab_tracker_->GetResource(tab_handle);
     if (!nav)
       return;
     Browser* browser = FindAndActivateTab(nav);
 
     // If the browser has UI, simulate what a user would do.
     // Activate the tab and then click the encoding menu.
-    if (browser &&
-        browser->command_updater()->IsCommandEnabled(IDC_ENCODING_MENU)) {
+    if (browser && chrome::IsCommandEnabled(browser, IDC_ENCODING_MENU)) {
       int selected_encoding_id =
           CharacterEncoding::GetCommandIdByCanonicalEncodingName(encoding_name);
       if (selected_encoding_id) {
         browser->OverrideEncoding(selected_encoding_id);
         *success = true;
       }
     } else {
       // There is no UI, Chrome probably runs as Chrome-Frame mode.
       // Try to get WebContents and call its override_encoding method.
       WebContents* contents = nav->GetWebContents();
@@ skipping 174 matching lines @@
 
   return NULL;
 }
 
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   WebContents* web_contents = GetWebContentsForHandle(tab_handle, &tab);
   if (web_contents)
     web_contents->OnSavePage();
 }