Native menu implementation for bug 5679. Followup to http://codereview.chromium.org/2928005/

views/controls/menu/native_menu_win.cc

 // Copyright (c) 2011 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 "base/logging.h"
+#include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/win/wrapped_window_proc.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
@@ skipping 315 matching lines @@
   // variable so the hook has access to it (ugly, but it's the
   // only way).
   open_native_menu_win_ = this;
   HHOOK hhook = SetWindowsHookEx(WH_MSGFILTER, MenuMessageHook,
                                  GetModuleHandle(NULL), ::GetCurrentThreadId());
 
   // Mark that any registered listeners have not been called for this particular
   // opening of the menu.
   listeners_called_ = false;
 
+  // Retrieving favicons from history requires nestable tasks.
+  MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
+
+  model_->SetMenuModelDelegate(this);
+
   // Command dispatch is done through WM_MENUCOMMAND, handled by the host
   // window.
   HWND hwnd = host_window_->hwnd();
   TrackPopupMenuEx(menu_, flags, point.x(), point.y(), host_window_->hwnd(),
                    NULL);
 
+  model_->SetMenuModelDelegate(NULL);
   UnhookWindowsHookEx(hhook);
   open_native_menu_win_ = NULL;
 }
 
 void NativeMenuWin::CancelMenu() {
   EndMenu();
 }
 
 void NativeMenuWin::Rebuild() {
   ResetNativeMenu();
@@ skipping 50 matching lines @@
         listeners_.erase(iter);
         return;
       }
   }
 }
 
 void NativeMenuWin::SetMinimumWidth(int width) {
   NOTIMPLEMENTED();
 }
 
+void NativeMenuWin::OnIconChanged(int model_index) {
+  // Translate the model_index to the menu_index.
+  int first_item_index_ = model_->GetFirstItemIndex(GetNativeMenu());
+  int menu_index = model_index + first_item_index_;
+  // Unfortunately this repaints the entire menu.
+  SetMenuItemState(menu_index, model_->IsEnabledAt(model_index),
+                   model_->IsItemCheckedAt(model_index), false);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuWin, private:
 
 // static
 NativeMenuWin* NativeMenuWin::open_native_menu_win_ = NULL;
 
 // static
 bool NativeMenuWin::GetHighlightedMenuItemInfo(
     HMENU menu, bool* has_parent, bool* has_submenu) {
   for (int i = 0; i < ::GetMenuItemCount(menu); i++) {
@@ skipping 206 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views