Change SimpleMenuModel on OSX to support dynamic icons

app/menus/button_menu_item_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_BUTTON_MENU_ITEM_MODEL_H_
 #define APP_MENUS_BUTTON_MENU_ITEM_MODEL_H_
 #pragma once
 
 #include <vector>
 
 #include "base/string16.h"
 
 namespace menus {
 
 // A model representing the rows of buttons that should be inserted in a button
 // containing menu item.
 class ButtonMenuItemModel {
  public:
   // Types of buttons.
   enum ButtonType {
     TYPE_SPACE,
     TYPE_BUTTON,
     TYPE_BUTTON_LABEL
   };
 
   class Delegate {
    public:
     // Some command ids have labels that change over time.
-    virtual bool IsLabelForCommandIdDynamic(int command_id) const;
+    virtual bool IsItemForCommandIdDynamic(int command_id) const;
     virtual string16 GetLabelForCommandId(int command_id) const;
 
     // Performs the action associated with the specified command id.
     virtual void ExecuteCommand(int command_id) = 0;
     virtual bool IsCommandIdEnabled(int command_id) const;
     virtual bool DoesCommandIdDismissMenu(int command_id) const;
 
    protected:
     virtual ~Delegate() {}
   };
 
   ButtonMenuItemModel(int string_id, ButtonMenuItemModel::Delegate* delegate);
   ~ButtonMenuItemModel();
 
   // Adds a button that will emit |command_id|. All buttons created through
   // this method will have the same size, based on the largest button.
   void AddGroupItemWithStringId(int command_id, int string_id);
 
   // Adds a button that has an icon instead of a label.
   void AddItemWithImage(int command_id, int icon_idr);
 
   // Adds a non-clickable button with a desensitized label that doesn't do
-  // anything. Usually combined with IsLabelForCommandIdDynamic() to add
+  // anything. Usually combined with IsItemForCommandIdDynamic() to add
   // information.
   void AddButtonLabel(int command_id, int string_id);
 
   // Adds a small horizontal space.
   void AddSpace();
 
   // Returns the number of items for iteration.
   int GetItemCount() const;
 
   // Returns what kind of item is at |index|.
   ButtonType GetTypeAt(int index) const;
 
   // Changes a position into a command ID.
   int GetCommandIdAt(int index) const;
 
   // Whether the label for item |index| changes.
-  bool IsLabelDynamicAt(int index) const;
+  bool IsItemDynamicAt(int index) const;
 
   // Returns the current label value for the button at |index|.
   string16 GetLabelAt(int index) const;
 
   // If the button at |index| should have an icon instead, returns true and
   // sets the IDR |icon|.
   bool GetIconAt(int index, int* icon) const;
 
   // If the button at |index| should have its size equalized along with all
   // other items that have their PartOfGroup bit set.
@@ skipping 24 matching lines @@
   std::vector<Item> items_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonMenuItemModel);
 };
 
 }  // namespace menus
 
 #endif  // APP_MENUS_BUTTON_MENU_ITEM_MODEL_H_