GTK: Add Recently Closed tabs to the History menu in the global menu bar.

chrome/browser/ui/gtk/global_menu_bar.cc

Index: chrome/browser/ui/gtk/global_menu_bar.cc
diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc
index 6442e41dce300efbc8a7f7549a03538f1812bba8..368faaa64065384caea80fb02d119ea2891be8e9 100644
--- a/chrome/browser/ui/gtk/global_menu_bar.cc
+++ b/chrome/browser/ui/gtk/global_menu_bar.cc
@@ -11,6 +11,8 @@
 #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/gtk_util.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ -20,12 +22,14 @@
 struct GlobalMenuBarCommand {
   int str_id;
   int command;
+  int tag;
 };
 
 namespace {
 
 const int MENU_SEPARATOR =-1;
 const int MENU_END = -2;
+const int MENU_DISABLED_LABEL = -3;
 
 GlobalMenuBarCommand file_menu[] = {
   { IDS_NEW_TAB, IDC_NEW_TAB },
@@ -99,6 +103,47 @@ GlobalMenuBarCommand view_menu[] = {
   { MENU_END, MENU_END }
 };
 
+GlobalMenuBarCommand history_menu[] = {

[Evan Stade, 2011/04/19 18:17:10]

move into global_history_menu.cc

[Elliot Glaysher, 2011/04/19 19:52:08]

These definitions are used in this file. GlobalHistoryMenu takes ownership of
the built menu and then modifies it based on state changes.

+  { IDS_HISTORY_HOME_LINUX, IDC_HOME },
+  { IDS_HISTORY_BACK_LINUX, IDC_BACK },
+  { IDS_HISTORY_FORWARD_LINUX, IDC_FORWARD },
+
+  { MENU_SEPARATOR, MENU_SEPARATOR },
+
+  { IDS_HISTORY_VISITED_LINUX, MENU_DISABLED_LABEL,
+    GlobalMenuBar::TAG_MOST_VISITED_HEADER },
+
+  { MENU_SEPARATOR, MENU_SEPARATOR },
+
+  { 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_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 },
@@ -126,28 +171,31 @@ GlobalMenuBarCommand help_menu[] = {
 
 }  // namespace
 
-GlobalMenuBar::GlobalMenuBar(Browser* browser,
-                             BrowserWindowGtk* window)
+GlobalMenuBar::GlobalMenuBar(Browser* browser)
     : browser_(browser),
-      browser_window_(window),
+      profile_(browser_->profile()),
       menu_bar_(gtk_menu_bar_new()),
+      history_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_, TRUE);
+  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_, "chrome-hidden-global-menubar");
+  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);
   BuildGtkMenuFrom(IDS_TOOLS_MENU_LINUX, &id_to_menu_item_, tools_menu);
   BuildGtkMenuFrom(IDS_HELP_MENU_LINUX, &id_to_menu_item_, help_menu);
 
-  for (IDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
+  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(
@@ -179,7 +227,7 @@ GlobalMenuBar::GlobalMenuBar(Browser* browser,
 }
 
 GlobalMenuBar::~GlobalMenuBar() {
-  for (IDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
+  for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
        it != id_to_menu_item_.end(); ++it) {
     browser_->command_updater()->RemoveCommandObserver(it->first, this);
   }
@@ -187,32 +235,15 @@ GlobalMenuBar::~GlobalMenuBar() {
   g_object_unref(dummy_accel_group_);
 }
 
-void GlobalMenuBar::BuildGtkMenuFrom(int menu_str_id,
-                                     std::map<int, GtkWidget*>* id_to_menu_item,
-                                     GlobalMenuBarCommand* commands) {
+GtkWidget* GlobalMenuBar::BuildGtkMenuFrom(

[Evan Stade, 2011/04/19 18:17:10]

you know, I'm sorry for not thinking about this before, but why aren't you using
MenuGtk? seems like BuildGtkMenuFrom and BuildMenuItem wind up re-writing a lot
of code from MenuGtk, and that will increase as you have to support things like
items updating (e.g. favicons).

[Elliot Glaysher, 2011/04/19 19:52:08]

I was unsure exactly how robust Ubuntu's global menu code would be to weird
things. The MenuGtk code updates the menu after the "show" signal has been
emitted, in a posted task. I wanted to minimize any risk here by matching how a
"normal" program would keep the menu updated. Poking at the global menu code,
every gtk_menu_* call gets turned into a dbus message. :(

+    int menu_str_id,
+    std::map<int, GtkWidget*>* id_to_menu_item,
+    GlobalMenuBarCommand* commands) {
   GtkWidget* menu = gtk_menu_new();
   for (int i = 0; commands[i].str_id != MENU_END; ++i) {
-    GtkWidget* menu_item = NULL;
-    if (commands[i].str_id == MENU_SEPARATOR) {
-      menu_item = gtk_separator_menu_item_new();
-    } else {
-      int command_id = commands[i].command;
-      std::string label =
-          gfx::ConvertAcceleratorsFromWindowsStyle(
-              l10n_util::GetStringUTF8(commands[i].str_id));
-
-      if (command_id == IDC_SHOW_BOOKMARK_BAR)
-        menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
-      else
-        menu_item = gtk_menu_item_new_with_mnemonic(label.c_str());
-
-      id_to_menu_item->insert(std::make_pair(command_id, menu_item));
-      g_object_set_data(G_OBJECT(menu_item), "command-id",
-                        GINT_TO_POINTER(command_id));
-      g_signal_connect(menu_item, "activate",
-                       G_CALLBACK(OnItemActivatedThunk), this);
-    }
-    gtk_widget_show(menu_item);
+    GtkWidget* menu_item = BuildMenuItem(
+        commands[i].str_id, commands[i].command, commands[i].tag,
+        id_to_menu_item, menu);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
   }
 
@@ -223,12 +254,51 @@ void GlobalMenuBar::BuildGtkMenuFrom(int menu_str_id,
           l10n_util::GetStringUTF8(menu_str_id)).c_str());
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), menu);
   gtk_widget_show(menu_item);
+  gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar_.get()), menu_item);
+
+  return menu;
+}
 
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar_), menu_item);
+GtkWidget* GlobalMenuBar::BuildMenuItem(
+    int string_id,
+    int command_id,
+    int tag_id,
+    std::map<int, GtkWidget*>* id_to_menu_item,
+    GtkWidget* menu_to_add_to) {
+  GtkWidget* menu_item = NULL;
+  if (string_id == MENU_SEPARATOR) {
+    menu_item = gtk_separator_menu_item_new();
+  } else {
+    std::string label =
+        gfx::ConvertAcceleratorsFromWindowsStyle(
+            l10n_util::GetStringUTF8(string_id));
+
+    if (command_id == IDC_SHOW_BOOKMARK_BAR)
+      menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
+    else
+      menu_item = gtk_menu_item_new_with_mnemonic(label.c_str());
+
+    if (tag_id) {
+      g_object_set_data(G_OBJECT(menu_item), "type-tag",
+                        GINT_TO_POINTER(tag_id));
+    }
+
+    if (command_id == MENU_DISABLED_LABEL) {
+      gtk_widget_set_sensitive(menu_item, FALSE);
+    } else {
+      id_to_menu_item->insert(std::make_pair(command_id, menu_item));
+      g_object_set_data(G_OBJECT(menu_item), "command-id",
+                        GINT_TO_POINTER(command_id));
+      g_signal_connect(menu_item, "activate",
+                       G_CALLBACK(OnItemActivatedThunk), this);
+    }
+  }
+  gtk_widget_show(menu_item);
+  return menu_item;
 }
 
 void GlobalMenuBar::EnabledStateChangedForCommand(int id, bool enabled) {
-  IDMenuItemMap::iterator it = id_to_menu_item_.find(id);
+  CommandIDMenuItemMap::iterator it = id_to_menu_item_.find(id);
   if (it != id_to_menu_item_.end())
     gtk_widget_set_sensitive(it->second, enabled);
 }
@@ -238,13 +308,15 @@ void GlobalMenuBar::Observe(NotificationType type,
                             const NotificationDetails& details) {
   DCHECK(type.value == NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED);
 
-  IDMenuItemMap::iterator it = id_to_menu_item_.find(IDC_SHOW_BOOKMARK_BAR);
+  CommandIDMenuItemMap::iterator it =
+      id_to_menu_item_.find(IDC_SHOW_BOOKMARK_BAR);
   if (it != id_to_menu_item_.end()) {
     PrefService* prefs = browser_->profile()->GetPrefs();
 
     block_activation_ = true;
-    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(it->second),
-                                   prefs->GetBoolean(prefs::kShowBookmarkBar));
+    gtk_check_menu_item_set_active(
+        GTK_CHECK_MENU_ITEM(it->second),
+        prefs->GetBoolean(prefs::kShowBookmarkBar));
     block_activation_ = false;
   }
 }