Change SimpleMenuModel on OSX to support dynamic icons

views/controls/menu/native_menu_x.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 "views/controls/menu/native_menu_x.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/skia_util.h"
@@ skipping 118 matching lines @@
     if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SEPARATOR) {
       ++sep;
       continue;
     }
 
     // The submenu excludes the separators when counting the menu-items
     // in it. So exclude the number of separators to get the correct index.
     MenuItemView* mitem = menu->GetMenuItemAt(index - sep);
     mitem->SetVisible(model->IsVisibleAt(index));
     mitem->SetEnabled(model->IsEnabledAt(index));
-    if (model->IsLabelDynamicAt(index)) {
+    if (model->IsItemDynamicAt(index)) {
       mitem->SetTitle(UTF16ToWide(model->GetLabelAt(index)));
     }
 
     SkBitmap icon;
     if (model->GetIconAt(index, &icon)) {
+      // TODO(atwilson): Support removing the icon dynamically
+      // (http://crbug.com/66508).
       mitem->SetIcon(icon);
     }
 
     if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SUBMENU) {
       DCHECK(mitem->HasSubmenu());
       UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index));
     }
   }
 }
 
 // MenuWrapper, public:
 
 #if !defined(OS_CHROMEOS)
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuX(menu);
 }
 #endif
 
 }  // namespace views