GTK: Remove the global bookmark menu code. It's been behind a flag and bitrotting.

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 "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/gtk/accelerators_gtk.h"
-#include "chrome/browser/ui/gtk/global_bookmark_menu.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/common/notification_details.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 85 matching lines @@
   { IDS_HISTORY_CLOSED_LINUX, MENU_DISABLED_LABEL,
     GlobalMenuBar::TAG_RECENTLY_CLOSED_HEADER },
 
   { MENU_SEPARATOR, MENU_SEPARATOR },
 
   { 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_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 },
 
   { IDS_TASK_MANAGER, IDC_TASK_MANAGER },
   { IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA },
 
@@ skipping 27 matching lines @@
 
   // 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, NULL);
   BuildGtkMenuFrom(IDS_EDIT_MENU_LINUX, &id_to_menu_item_, edit_menu, NULL);
   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_);
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableGlobalBookmarkMenu)) {
-    // TODO(erg): dbusmenu-glib in Ubuntu Natty does not like it when we shove
-    // 100k or more of favicon data over it. Users have reported that the
-    // browser hangs on startup for over a minute and breaking during this time
-    // shows a stack entirely of dbus/glib code (See #86715).  For now, just
-    // hide the menu until appmenu-gtk catches up and doesn't hang if we throw
-    // (potentially) megs of icon data at it. (Some of our users have thousands
-    // of bookmarks and we're already unacceptably laggy at 100.)
-    //
-    // http://crbug.com/86715, http://crbug.com/85466
-    bookmark_menu_.reset(new GlobalBookmarkMenu(browser_));
-    BuildGtkMenuFrom(IDS_BOOKMARKS_MENU_LINUX, &id_to_menu_item_, bookmark_menu,
-                     bookmark_menu_.get());
-  }
-
   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));
 
@@ skipping 128 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);
 }