Reapply r50859 with chromeos fixes.

chrome/browser/gtk/menu_gtk.h

Index: chrome/browser/gtk/menu_gtk.h
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h
index 0612d4c442310a9eacd76ad944496eac847ae6ce..a9a703a0fd515d0f3f4104120bfe3f198b2c7cc9 100644
--- a/chrome/browser/gtk/menu_gtk.h
+++ b/chrome/browser/gtk/menu_gtk.h
@@ -16,6 +16,7 @@
 class SkBitmap;
 
 namespace menus {
+class ButtonMenuItemModel;
 class MenuModel;
 }
 
@@ -60,7 +61,8 @@ class MenuGtk {
   GtkWidget* AppendMenuItem(int command_id, GtkWidget* menu_item);
   GtkWidget* AppendMenuItemToMenu(int command_id,
                                   GtkWidget* menu_item,
-                                  GtkWidget* menu);
+                                  GtkWidget* menu,
+                                  bool connect_to_activate);
 
   // Displays the menu. |timestamp| is the time of activation. The popup is
   // statically positioned at |widget|.
@@ -114,6 +116,8 @@ class MenuGtk {
   void BuildMenuFromModel();
   // Implementation of the above; called recursively.
   void BuildSubmenuFromModel(menus::MenuModel* model, GtkWidget* menu);
+  // Builds a menu item with buttons in it from the data in the model.
+  GtkWidget* BuildButtomMenuItem(menus::ButtonMenuItemModel* model);
 
   // Contains implementation for OnMenuShow.
   void UpdateMenu();
@@ -123,6 +127,10 @@ class MenuGtk {
   // Callback for when a menu item is clicked.
   static void OnMenuItemActivated(GtkMenuItem* menuitem, MenuGtk* menu);
 
+  // Called when one of the buttons are pressed.
+  static void OnMenuButtonPressed(GtkMenuItem* menuitem, int command_id,
+                                  MenuGtk* menu);
+
   // Sets the check mark and enabled/disabled state on our menu items.
   static void SetMenuItemInfo(GtkWidget* widget, void* raw_menu);