Change SimpleMenuModel on OSX to support dynamic icons

views/controls/menu/native_menu_win.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_win.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
@@ skipping 354 matching lines @@
 }
 
 void NativeMenuWin::UpdateStates() {
   // A depth-first walk of the menu items, updating states.
   int model_index = 0;
   std::vector<ItemData*>::const_iterator it;
   for (it = items_.begin(); it != items_.end(); ++it, ++model_index) {
     int menu_index = model_index + first_item_index_;
     SetMenuItemState(menu_index, model_->IsEnabledAt(model_index),
                      model_->IsItemCheckedAt(model_index), false);
-    if (model_->IsLabelDynamicAt(model_index)) {
+    if (model_->IsItemDynamicAt(model_index)) {
+      // TODO(atwilson): Update the icon as well (http://crbug.com/66508).
       SetMenuItemLabel(menu_index, model_index,
                        model_->GetLabelAt(model_index));
     }
     Menu2* submenu = (*it)->submenu.get();
     if (submenu)
       submenu->UpdateStates();
   }
 }
 
 gfx::NativeMenu NativeMenuWin::GetNativeMenu() const {
@@ skipping 239 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views