Revert "Revert 85330 - GTK: Bring global menu out of about:flags."

chrome/browser/ui/gtk/global_history_menu.h

 // Copyright (c) 2011 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_HISTORY_MENU_H_
 #define CHROME_BROWSER_UI_GTK_GLOBAL_HISTORY_MENU_H_
 
 #include <map>
 
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
+#include "chrome/browser/ui/gtk/global_menu_owner.h"
+#include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "content/browser/cancelable_request.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 class Browser;
 
 namespace history {
 class TopSites;
 }
 
 typedef struct _GdkPixbuf GdkPixbuf;
 
 // Controls the History menu.
-class GlobalHistoryMenu : public NotificationObserver,
+class GlobalHistoryMenu : public GlobalMenuOwner,
+                          public NotificationObserver,
                           public TabRestoreServiceObserver {
  public:
   explicit GlobalHistoryMenu(Browser* browser);
   virtual ~GlobalHistoryMenu();
 
   // Takes the history menu we need to modify based on the tab restore/most
   // visited state.
-  void Init(GtkWidget* history_menu);
+  virtual void Init(GtkWidget* history_menu, GtkWidget* history_menu_item);
 
  private:
   class HistoryItem;
   struct ClearMenuClosure;
   struct GetIndexClosure;
 
   typedef std::map<GtkWidget*, HistoryItem*> MenuItemToHistoryMap;
 
   // Sends a message off to History for data.
   void GetTopSitesData();
@@ skipping 46 matching lines @@
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // For TabRestoreServiceObserver
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);
 
   CHROMEGTK_CALLBACK_0(GlobalHistoryMenu, void, OnRecentlyClosedItemActivated);
 
+  // Listen for the first menu show command so we can then connect to the
+  // TabRestoreService. With how the global menus work, I'd prefer to register
+  // with the TabRestoreService as soon as we're constructed, but this breaks
+  // unit tests which test the service (because they force different
+  // construction ordering while us connecting to the TabRestoreService loads
+  // data now!)
+  CHROMEGTK_CALLBACK_0(GlobalHistoryMenu, void, OnMenuActivate);
+
   Browser* browser_;
   Profile* profile_;
 
+  // The history menu. We keep this since we need to rewrite parts of it
+  // periodically.
+  OwnedWidgetGtk history_menu_;
+
   history::TopSites* top_sites_;
   CancelableRequestConsumer top_sites_consumer_;
 
-  NotificationRegistrar registrar_;
-
   GdkPixbuf* default_favicon_;
 
-  // The history menu. We keep this since we need to rewrite parts of it
-  // periodically.
-  GtkWidget* history_menu_;
-
   TabRestoreService* tab_restore_service_;  // weak
 
   // A mapping from GtkMenuItems to HistoryItems that maintain data.
   MenuItemToHistoryMap menu_item_history_map_;
 
   // Maps HistoryItems to favicon request Handles.
   CancelableRequestConsumerTSimple<HistoryItem*> favicon_consumer_;
+
+  NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_GLOBAL_HISTORY_MENU_H_