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

chrome/browser/ui/gtk/global_menu_bar.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_
 #define CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/command_updater.h"
+#include "chrome/browser/command_observer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/ui/gtk/global_history_menu.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 class Browser;
 struct GlobalMenuBarCommand;
 class GlobalMenuOwner;
 
 typedef struct _GtkAccelGroup GtkAccelGroup;
 typedef struct _GtkWidget GtkWidget;
 
 // Controls the Mac style menu bar on Linux.
 //
 // Unity and some configurations of GNOME have a Apple-like menu bar at the top
 // of the screen that changes depending on the active window. These mainly work
 // by inspecting the application's widget hierarchy, and intercepting any
 // GtkMenuBar found. Thankfully, these systems don't check to see if the menu
 // bar itself is visible, so we insert a GtkMenuBar into the window hierarchy
 // and set it to be invisible.
-class GlobalMenuBar : public CommandUpdater::CommandObserver,
+class GlobalMenuBar : public CommandObserver,
                       public content::NotificationObserver {
  public:
   static const int TAG_NORMAL = 0;
   static const int TAG_MOST_VISITED = 1;
   static const int TAG_RECENTLY_CLOSED = 2;
   static const int TAG_MOST_VISITED_HEADER = 3;
   static const int TAG_RECENTLY_CLOSED_HEADER = 4;
   static const int TAG_BOOKMARK_CLEARABLE = 5;
 
   explicit GlobalMenuBar(Browser* browser);
@@ skipping 14 matching lines @@
                         GlobalMenuBarCommand* commands,
                         GlobalMenuOwner* owner);
 
   // Builds an individual menu item.
   GtkWidget* BuildMenuItem(int string_id,
                            int command_id,
                            int tag_id,
                            std::map<int, GtkWidget*>* id_to_menu_item,
                            GtkWidget* menu_to_add_to);
 
-  // CommandUpdater::CommandObserver:
+  // CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Updates the visibility of the bookmark bar on pref changes.
   void OnBookmarkBarVisibilityChanged();
 
@@ skipping 19 matching lines @@
   // A mapping from command ids to GtkMenuItem objects. We use this to update
   // the command enable state.
   CommandIDMenuItemMap id_to_menu_item_;
 
   // gtk_check_menu_item_set_active() will call the "activate" signal. We need
   // to block this activation while we change the checked state.
   bool block_activation_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_