Change SimpleMenuModel on OSX to support dynamic icons

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_
 #pragma once
 
 #include <vector>
 
@@ skipping 16 matching lines @@
     virtual bool IsCommandIdChecked(int command_id) const = 0;
     virtual bool IsCommandIdEnabled(int command_id) const = 0;
     virtual bool IsCommandIdVisible(int command_id) const;
 
     // Gets the accelerator for the specified command id. Returns true if the
     // command id has a valid accelerator, false otherwise.
     virtual bool GetAcceleratorForCommandId(
         int command_id,
         menus::Accelerator* accelerator) = 0;
 
-    // Some command ids have labels that change over time.
-    virtual bool IsLabelForCommandIdDynamic(int command_id) const;
+    // Some command ids have labels and icons that change over time.
+    virtual bool IsItemForCommandIdDynamic(int command_id) const;
     virtual string16 GetLabelForCommandId(int command_id) const;
+    // Gets the icon for the item with the specified id, returning true if there
+    // is an icon, false otherwise.
+    virtual bool GetIconForCommandId(int command_id, SkBitmap* icon) const;
 
     // Notifies the delegate that the item with the specified command id was
     // visually highlighted within the menu.
     virtual void CommandIdHighlighted(int command_id);
 
     // Performs the action associated with the specified command id.
     virtual void ExecuteCommand(int command_id) = 0;
 
    protected:
     virtual ~Delegate() {}
@@ skipping 43 matching lines @@
   // Returns the index of the item that has the given |command_id|. Returns
   // -1 if not found.
   int GetIndexOfCommandId(int command_id);
 
   // Overridden from MenuModel:
   virtual bool HasIcons() const;
   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 IsItemDynamicAt(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 bool IsVisibleAt(int index) const;
   virtual void HighlightChangedTo(int index);
   virtual void ActivatedAt(int index);
@@ skipping 19 matching lines @@
   void ValidateItem(const Item& item);
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuModel);
 };
 
 }  // namespace menus
 
 #endif  // APP_MENUS_SIMPLE_MENU_MODEL_H_