GTK: Implement the global bookmarks menu.

chrome/browser/ui/gtk/global_menu_bar.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/global_menu_bar.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 112 matching lines @@
   { IDS_SHOWFULLHISTORY_LINK, IDC_SHOW_HISTORY },
 
   { MENU_END, MENU_END }
 };
 
 GlobalMenuBarCommand bookmark_menu[] = {
   { IDS_BOOKMARK_MANAGER, IDC_SHOW_BOOKMARK_MANAGER },
   { IDS_BOOKMARK_CURRENT_PAGE_LINUX, IDC_BOOKMARK_PAGE },
   { IDS_BOOKMARK_ALL_TABS_LINUX, IDC_BOOKMARK_ALL_TABS },
 
-  { MENU_SEPARATOR, MENU_SEPARATOR },
-  // TODO(erg): Real implementation of bookmark bar bookmarks!
-  { MENU_SEPARATOR, MENU_SEPARATOR },
-
-  { IDS_BOOMARK_BAR_OPEN_ALL, IDC_BOOKMARK_BAR_OPEN_ALL },
-  { IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW },
-  { IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO, IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO },
-
-  { MENU_SEPARATOR, MENU_SEPARATOR },
-  // TODO(erg): "Other bookmarks" bookmarks
-
   { MENU_END, MENU_END }
 };
 
 GlobalMenuBarCommand tools_menu[] = {
   { IDS_SHOW_DOWNLOADS, IDC_SHOW_DOWNLOADS },
   { IDS_SHOW_HISTORY, IDC_SHOW_HISTORY },
   { IDS_SHOW_EXTENSIONS, IDC_MANAGE_EXTENSIONS },
 
   { MENU_SEPARATOR, MENU_SEPARATOR },
 
@@ skipping 15 matching lines @@
   { MENU_END, MENU_END }
 };
 
 }  // namespace
 
 GlobalMenuBar::GlobalMenuBar(Browser* browser)
     : browser_(browser),
       profile_(browser_->profile()),
       menu_bar_(gtk_menu_bar_new()),
       history_menu_(browser_),
+      bookmark_menu_(browser_),
       dummy_accel_group_(gtk_accel_group_new()),
       block_activation_(false) {
   // The global menu bar should never actually be shown in the app; it should
   // instead remain in our widget hierarchy simply to be noticed by third party
   // components.
   gtk_widget_set_no_show_all(menu_bar_.get(), TRUE);
 
   // Set a nice name so it shows up in gtkparasite and others.
   gtk_widget_set_name(menu_bar_.get(), "chrome-hidden-global-menubar");
 
   BuildGtkMenuFrom(IDS_FILE_MENU_LINUX, &id_to_menu_item_, file_menu);
   BuildGtkMenuFrom(IDS_EDIT_MENU_LINUX, &id_to_menu_item_, edit_menu);
   BuildGtkMenuFrom(IDS_VIEW_MENU_LINUX, &id_to_menu_item_, view_menu);
   history_menu_.Init(BuildGtkMenuFrom(IDS_HISTORY_MENU_LINUX, &id_to_menu_item_,
                                       history_menu));
-  BuildGtkMenuFrom(IDS_BOOKMARKS_MENU_LINUX, &id_to_menu_item_, bookmark_menu);
+  bookmark_menu_.Init(BuildGtkMenuFrom(IDS_BOOKMARKS_MENU_LINUX,
+                                       &id_to_menu_item_, bookmark_menu));
   BuildGtkMenuFrom(IDS_TOOLS_MENU_LINUX, &id_to_menu_item_, tools_menu);
   BuildGtkMenuFrom(IDS_HELP_MENU_LINUX, &id_to_menu_item_, help_menu);
 
   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));
 
@@ skipping 116 matching lines @@
   }
 }
 
 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);
 }