Reapply r50859 with chromeos fixes.

chrome/browser/gtk/menu_gtk.h

 // Copyright (c) 2010 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_GTK_MENU_GTK_H_
 #define CHROME_BROWSER_GTK_MENU_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/task.h"
 #include "gfx/point.h"
 
 class SkBitmap;
 
 namespace menus {
+class ButtonMenuItemModel;
 class MenuModel;
 }
 
 class MenuGtk {
  public:
   // Delegate class that lets another class control the status of the menu.
   class Delegate {
    public:
     virtual ~Delegate() { }
 
@@ skipping 24 matching lines @@
   // is the new menu item.
   GtkWidget* AppendMenuItemWithLabel(int command_id, const std::string& label);
   GtkWidget* AppendMenuItemWithIcon(int command_id, const std::string& label,
                                     const SkBitmap& icon);
   GtkWidget* AppendCheckMenuItemWithLabel(int command_id,
                                           const std::string& label);
   GtkWidget* AppendSeparator();
   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|.
   void Popup(GtkWidget* widget, gint button_type, guint32 timestamp);
 
   // Displays the menu using the button type and timestamp of |event|. The popup
   // is statically positioned at |widget|.
   void Popup(GtkWidget* widget, GdkEvent* event);
 
   // Displays the menu as a context menu, i.e. at the current cursor location.
@@ skipping 33 matching lines @@
 
  private:
   // Builds a GtkImageMenuItem.
   GtkWidget* BuildMenuItemWithImage(const std::string& label,
                                     const SkBitmap& icon);
 
   // A function that creates a GtkMenu from |model_|.
   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();
 
   void ExecuteCommand(menus::MenuModel* model, int id);
 
   // 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);
 
   // Updates all the menu items' state.
   static void OnMenuShow(GtkWidget* widget, MenuGtk* menu);
 
   // Sets the activating widget back to a normal appearance.
   static void OnMenuHidden(GtkWidget* widget, MenuGtk* menu);
 
   // Queries this object about the menu state.
@@ skipping 17 matching lines @@
   // menu.
   static bool block_activation_;
 
   // We must free these at shutdown.
   std::vector<MenuGtk*> submenus_we_own_;
 
   ScopedRunnableMethodFactory<MenuGtk> factory_;
 };
 
 #endif  // CHROME_BROWSER_GTK_MENU_GTK_H_