Change SimpleMenuModel on OSX to support dynamic icons

app/menus/button_menu_item_model.cc

 // 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.
 
 #include "app/menus/button_menu_item_model.h"
 
 #include "app/l10n_util.h"
 
 namespace menus {
 
-bool ButtonMenuItemModel::Delegate::IsLabelForCommandIdDynamic(
+bool ButtonMenuItemModel::Delegate::IsItemForCommandIdDynamic(
     int command_id) const {
   return false;
 }
 
 string16 ButtonMenuItemModel::Delegate::GetLabelForCommandId(
     int command_id) const {
   return string16();
 }
 
 bool ButtonMenuItemModel::Delegate::IsCommandIdEnabled(int command_id) const {
@@ skipping 53 matching lines @@
 
 ButtonMenuItemModel::ButtonType ButtonMenuItemModel::GetTypeAt(
     int index) const {
   return items_[index].type;
 }
 
 int ButtonMenuItemModel::GetCommandIdAt(int index) const {
   return items_[index].command_id;
 }
 
-bool ButtonMenuItemModel::IsLabelDynamicAt(int index) const {
+bool ButtonMenuItemModel::IsItemDynamicAt(int index) const {
   if (delegate_)
-    return delegate_->IsLabelForCommandIdDynamic(GetCommandIdAt(index));
+    return delegate_->IsItemForCommandIdDynamic(GetCommandIdAt(index));
   return false;
 }
 
 string16 ButtonMenuItemModel::GetLabelAt(int index) const {
-  if (IsLabelDynamicAt(index))
+  if (IsItemDynamicAt(index))
     return delegate_->GetLabelForCommandId(GetCommandIdAt(index));
   return items_[index].label;
 }
 
 bool ButtonMenuItemModel::GetIconAt(int index, int* icon_idr) const {
   if (items_[index].icon_idr == -1)
     return false;
 
   *icon_idr = items_[index].icon_idr;
   return true;
@@ skipping 23 matching lines @@
 }
 
 bool ButtonMenuItemModel::DoesCommandIdDismissMenu(int command_id) const {
   if (delegate_)
     return delegate_->DoesCommandIdDismissMenu(command_id);
   return true;
 }
 
 
 }  // namespace menus