Reapply r50859 with chromeos fixes.

app/menus/simple_menu_model.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 APP_MENUS_SIMPLE_MENU_MODEL_H_
 #define APP_MENUS_SIMPLE_MENU_MODEL_H_
 
 #include <vector>
 
 #include "base/string16.h"
+#include "app/menus/button_menu_item_model.h"
 #include "app/menus/menu_model.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace menus {
 
 // A simple MenuModel implementation with an imperative API for adding menu
 // items. This makes it easy to construct fixed menus. Menus populated by
 // dynamic data sources may be better off implementing MenuModel directly.
 // The breadth of MenuModel is not exposed through this API.
 class SimpleMenuModel : public MenuModel {
@@ skipping 32 matching lines @@
   virtual ~SimpleMenuModel();
 
   // Methods for adding items to the model.
   void AddItem(int command_id, const string16& label);
   void AddItemWithStringId(int command_id, int string_id);
   void AddSeparator();
   void AddCheckItem(int command_id, const string16& label);
   void AddCheckItemWithStringId(int command_id, int string_id);
   void AddRadioItem(int command_id, const string16& label, int group_id);
   void AddRadioItemWithStringId(int command_id, int string_id, int group_id);
+
+  // These three methods take pointers to various sub-models. These models
+  // should be owned by the same owner of this SimpleMenuModel.
+  void AddButtonItem(int command_id, ButtonMenuItemModel* model);
   void AddSubMenu(int command_id, const string16& label, MenuModel* model);
   void AddSubMenuWithStringId(int command_id, int string_id, MenuModel* model);
 
   // Methods for inserting items into the model.
   void InsertItemAt(int index, int command_id, const string16& label);
   void InsertItemWithStringIdAt(int index, int command_id, int string_id);
   void InsertSeparatorAt(int index);
   void InsertCheckItemAt(int index, int command_id, const string16& label);
   void InsertCheckItemWithStringIdAt(int index, int command_id, int string_id);
   void InsertRadioItemAt(
@@ skipping 22 matching lines @@
   virtual int GetItemCount() const;
   virtual ItemType GetTypeAt(int index) const;
   virtual int GetCommandIdAt(int index) const;
   virtual string16 GetLabelAt(int index) const;
   virtual bool IsLabelDynamicAt(int index) const;
   virtual bool GetAcceleratorAt(int index,
                                 menus::Accelerator* accelerator) const;
   virtual bool IsItemCheckedAt(int index) const;
   virtual int GetGroupIdAt(int index) const;
   virtual bool GetIconAt(int index, SkBitmap* icon) const;
+  virtual menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
   virtual bool IsEnabledAt(int index) const;
   virtual void HighlightChangedTo(int index);
   virtual void ActivatedAt(int index);
   virtual MenuModel* GetSubmenuModelAt(int index) const;
 
  protected:
   // Some variants of this model (SystemMenuModel) relies on items to be
   // inserted backwards. This is counter-intuitive for the API, so rather than
   // forcing customers to insert things backwards, we return the indices
   // backwards instead. That's what this method is for. By default, it just
   // returns what it's passed.
   virtual int FlipIndex(int index) const { return index; }
 
   Delegate* delegate() { return delegate_; }
 
  private:
   struct Item {
     int command_id;
     string16 label;
     SkBitmap icon;
     ItemType type;
     int group_id;
     MenuModel* submenu;
+    ButtonMenuItemModel* button_model;
   };
   std::vector<Item> items_;
 
   // Functions for inserting items into |items_|.
   void AppendItem(const Item& item);
   void InsertItemAtIndex(const Item& item, int index);
   void ValidateItem(const Item& item);
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuModel);
 };
 
 }  // namespace menus
 
 #endif  // APP_MENUS_SIMPLE_MENU_MODEL_H_