Rework a loop in the native menu code to iterate over the vector of items we ...

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2009 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/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ skipping 328 matching lines @@
     int model_index = menu_index - first_item_index_;
     if (model_->GetTypeAt(model_index) == Menu2Model::TYPE_SEPARATOR)
       AddSeparatorItemAt(menu_index, model_index);
     else
       AddMenuItemAt(menu_index, model_index);
   }
 }
 
 void NativeMenuWin::UpdateStates() {
   // A depth-first walk of the menu items, updating states.
-  for (int menu_index = first_item_index_;
-       menu_index < first_item_index_ + model_->GetItemCount(); ++menu_index) {
-    int model_index = menu_index - first_item_index_;
+  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)) {
       SetMenuItemLabel(menu_index, model_index,
-                       model_->GetLabelAt(model_index));
+        model_->GetLabelAt(model_index));

[sky, 2009/06/29 21:40:06]

nit: align with (

     }
-    Menu2* submenu = items_[model_index]->submenu.get();
+    Menu2* submenu = (*it)->submenu.get();
     if (submenu)
       submenu->UpdateStates();
   }
 }
 
 gfx::NativeMenu NativeMenuWin::GetNativeMenu() const {
   return menu_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 163 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views