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

chrome/browser/ui/gtk/global_menu_bar.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_MENU_BAR_H_
 #define CHROME_BROWSER_UI_GTK_GLOBAL_MENU_BAR_H_
 
 #include <map>
 
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/gtk/global_bookmark_menu.h"
 #include "chrome/browser/ui/gtk/global_history_menu.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.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
@@ skipping 11 matching lines @@
 
   explicit GlobalMenuBar(Browser* browser);
   virtual ~GlobalMenuBar();
 
   GtkWidget* widget() { return menu_bar_.get(); }
 
  private:
   typedef std::map<int, GtkWidget*> CommandIDMenuItemMap;
 
   // Helper function that builds the data.
-  GtkWidget* BuildGtkMenuFrom(int menu_str_id,
-                              std::map<int, GtkWidget*>* id_to_menu_item,
-                              GlobalMenuBarCommand* commands);
+  void BuildGtkMenuFrom(int menu_str_id,
+                        std::map<int, GtkWidget*>* id_to_menu_item,
+                        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:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
@@ skipping 28 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_