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

chrome/browser/ui/gtk/global_menu_bar.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/gtk/global_menu_bar.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
@@ skipping 138 matching lines @@
   BuildGtkMenuFrom(IDS_VIEW_MENU_LINUX, &id_to_menu_item_, view_menu, NULL);
   BuildGtkMenuFrom(IDS_HISTORY_MENU_LINUX, &id_to_menu_item_,
                    history_menu, &history_menu_);
 
   BuildGtkMenuFrom(IDS_TOOLS_MENU_LINUX, &id_to_menu_item_, tools_menu, NULL);
   BuildGtkMenuFrom(IDS_HELP_MENU_LINUX, &id_to_menu_item_, help_menu, NULL);
 
   for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
        it != id_to_menu_item_.end(); ++it) {
     // Get the starting enabled state.
-    gtk_widget_set_sensitive(
-        it->second,
-        browser_->command_updater()->IsCommandEnabled(it->first));
+    gtk_widget_set_sensitive(it->second,
+                             chrome::IsCommandEnabled(browser_, it->first));
 
     // Set the accelerator for each menu item.
     AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
     const ui::AcceleratorGtk* accelerator =
         accelerators->GetPrimaryAcceleratorForCommand(it->first);
     if (accelerator) {
       gtk_widget_add_accelerator(it->second,
                                  "activate",
                                  dummy_accel_group_,
                                  accelerator->GetGdkKeyCode(),
                                  accelerator->gdk_modifier_type(),
                                  GTK_ACCEL_VISIBLE);
     }
 
-    browser_->command_updater()->AddCommandObserver(it->first, this);
+    chrome::AddCommandObserver(browser_, it->first, this);
   }
 
   pref_change_registrar_.Init(browser_->profile()->GetPrefs());
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   OnBookmarkBarVisibilityChanged();
 }
 
 GlobalMenuBar::~GlobalMenuBar() {
   Disable();
   g_object_unref(dummy_accel_group_);
 }
 
 void GlobalMenuBar::Disable() {
   for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
        it != id_to_menu_item_.end(); ++it) {
-    browser_->command_updater()->RemoveCommandObserver(it->first, this);
+    chrome::RemoveCommandObserver(browser_, it->first, this);
   }
   id_to_menu_item_.clear();
 
   pref_change_registrar_.RemoveAll();
 }
 
 void GlobalMenuBar::BuildGtkMenuFrom(
     int menu_str_id,
     std::map<int, GtkWidget*>* id_to_menu_item,
     GlobalMenuBarCommand* commands,
@@ skipping 85 matching lines @@
         prefs->GetBoolean(prefs::kShowBookmarkBar));
     block_activation_ = false;
   }
 }
 
 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) {
   if (block_activation_)
     return;
 
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id"));
-  browser_->ExecuteCommandIfEnabled(id);
+  chrome::ExecuteCommand(browser_, id);
 }