Reapply r50859 with chromeos fixes.

app/menus/menu_model.h

 // Copyright (c) 2009 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 APP_MENUS_MENU_MODEL_H_
 #define APP_MENUS_MENU_MODEL_H_
 
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "gfx/native_widget_types.h"
 
 class SkBitmap;
 
 namespace gfx {
 
 class Font;
 
 }  // namespace gfx
 
 namespace menus {
 
 class Accelerator;
+class ButtonMenuItemModel;
 
 // An interface implemented by an object that provides the content of a menu.
 class MenuModel {
  public:
   virtual ~MenuModel() {}
 
   // The type of item.
   enum ItemType {
     TYPE_COMMAND,
     TYPE_CHECK,
     TYPE_RADIO,
     TYPE_SEPARATOR,
+    TYPE_BUTTON_ITEM,
     TYPE_SUBMENU
   };
 
   // Returns true if any of the items within the model have icons. Not all
   // platforms support icons in menus natively and so this is a hint for
   // triggering a custom rendering mode.
   virtual bool HasIcons() const = 0;
 
   // Returns the index of the first item. This is 0 for most menus except the
   // system menu on Windows. |native_menu| is the menu to locate the start index
@@ skipping 33 matching lines @@
   virtual bool IsItemCheckedAt(int index) const = 0;
 
   // Returns the id of the group of radio items that the item at the specified
   // index belongs to.
   virtual int GetGroupIdAt(int index) const = 0;
 
   // Gets the icon for the item at the specified index, returning true if there
   // is an icon, false otherwise.
   virtual bool GetIconAt(int index, SkBitmap* icon) const = 0;
 
+  // Returns the model for a menu item with a line of buttons at |index|.
+  virtual ButtonMenuItemModel* GetButtonMenuItemAt(int index) const = 0;
+
   // Returns the enabled state of the item at the specified index.
   virtual bool IsEnabledAt(int index) const = 0;
 
   // Returns the model for the submenu at the specified index.
   virtual MenuModel* GetSubmenuModelAt(int index) const = 0;
 
   // Called when the highlighted menu item changes to the item at the specified
   // index.
   virtual void HighlightChangedTo(int index) = 0;
 
   // Called when the item at the specified index has been activated.
   virtual void ActivatedAt(int index) = 0;
 
   // Called when the menu is about to be shown.
   virtual void MenuWillShow() {}
 
   // Retrieves the model and index that contains a specific command id. Returns
   // true if an item with the specified command id is found. |model| is inout,
   // and specifies the model to start searching from.
   static bool GetModelAndIndexForCommandId(int command_id, MenuModel** model,
                                            int* index);
 };
 
 }  // namespace
 
 #endif  // APP_MENUS_MENU_MODEL_H_