Change SimpleMenuModel on OSX to support dynamic icons

app/menus/simple_menu_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/simple_menu_model.h"
 
 #include "app/l10n_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 static const int kSeparatorId = -1;
@@ skipping 10 matching lines @@
   ButtonMenuItemModel* button_model;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel::Delegate, public:
 
 bool SimpleMenuModel::Delegate::IsCommandIdVisible(int command_id) const {
   return true;
 }
 
-bool SimpleMenuModel::Delegate::IsLabelForCommandIdDynamic(
+bool SimpleMenuModel::Delegate::IsItemForCommandIdDynamic(
     int command_id) const {
   return false;
 }
 
 string16 SimpleMenuModel::Delegate::GetLabelForCommandId(int command_id) const {
   return string16();
 }
 
+bool SimpleMenuModel::Delegate::GetIconForCommandId(
+    int command_id, SkBitmap* bitmap) const {
+  return false;
+}
+
 void SimpleMenuModel::Delegate::CommandIdHighlighted(int command_id) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, public:
 
 SimpleMenuModel::SimpleMenuModel(Delegate* delegate) : delegate_(delegate) {
 }
 
 SimpleMenuModel::~SimpleMenuModel() {
@@ skipping 144 matching lines @@
 
 MenuModel::ItemType SimpleMenuModel::GetTypeAt(int index) const {
   return items_.at(FlipIndex(index)).type;
 }
 
 int SimpleMenuModel::GetCommandIdAt(int index) const {
   return items_.at(FlipIndex(index)).command_id;
 }
 
 string16 SimpleMenuModel::GetLabelAt(int index) const {
-  if (IsLabelDynamicAt(index))
+  if (IsItemDynamicAt(index))
     return delegate_->GetLabelForCommandId(GetCommandIdAt(index));
   return items_.at(FlipIndex(index)).label;
 }
 
-bool SimpleMenuModel::IsLabelDynamicAt(int index) const {
+bool SimpleMenuModel::IsItemDynamicAt(int index) const {
   if (delegate_)
-    return delegate_->IsLabelForCommandIdDynamic(GetCommandIdAt(index));
+    return delegate_->IsItemForCommandIdDynamic(GetCommandIdAt(index));
   return false;
 }
 
 bool SimpleMenuModel::GetAcceleratorAt(int index,
                                        menus::Accelerator* accelerator) const {
   if (delegate_) {
     return delegate_->GetAcceleratorForCommandId(GetCommandIdAt(index),
                                                  accelerator);
   }
   return false;
 }
 
 bool SimpleMenuModel::IsItemCheckedAt(int index) const {
   if (!delegate_)
     return false;
   int item_index = FlipIndex(index);
   MenuModel::ItemType item_type = items_[item_index].type;
   return (item_type == TYPE_CHECK || item_type == TYPE_RADIO) ?
       delegate_->IsCommandIdChecked(GetCommandIdAt(index)) : false;
 }
 
 int SimpleMenuModel::GetGroupIdAt(int index) const {
   return items_.at(FlipIndex(index)).group_id;
 }
 
 bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) const {
+  if (IsItemDynamicAt(index))
+    return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
+
   if (items_[index].icon.isNull())
     return false;
 
   *icon = items_[index].icon;
   return true;
 }
 
 ButtonMenuItemModel* SimpleMenuModel::GetButtonMenuItemAt(int index) const {
   return items_.at(FlipIndex(index)).button_model;
 }
@@ skipping 49 matching lines @@
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace menus