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

views/controls/menu/native_menu_win.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_NATIVE_MENU_WIN_H_
 #define VIEWS_CONTROLS_MENU_NATIVE_MENU_WIN_H_
 #pragma once
 
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "views/controls/menu/menu_wrapper.h"
 
 namespace views {
 
 // A Windows implementation of MenuWrapper.
 // TODO(beng): rename to MenuWin once the old class is dead.
-class NativeMenuWin : public MenuWrapper {
+class NativeMenuWin : public MenuWrapper,
+                      public ui::MenuModelDelegate {
  public:
   // Construct a NativeMenuWin, with a model and delegate. If |system_menu_for|
   // is non-NULL, the NativeMenuWin wraps the system menu for that window.
   // The caller owns the model and the delegate.
   NativeMenuWin(ui::MenuModel* model, HWND system_menu_for);
   virtual ~NativeMenuWin();
 
   // Overridden from MenuWrapper:
   virtual void RunMenuAt(const gfx::Point& point, int alignment);
   virtual void CancelMenu();
   virtual void Rebuild();
   virtual void UpdateStates();
   virtual gfx::NativeMenu GetNativeMenu() const;
   virtual MenuAction GetMenuAction() const;
   virtual void AddMenuListener(MenuListener* listener);
   virtual void RemoveMenuListener(MenuListener* listener);
   virtual void SetMinimumWidth(int width);
+  // MenuModel:Delegate called when a favicon is loaded from history.

[sky, 2011/03/24 22:39:29]

Newline between 37/38. Also, add OVERRIDE.

+  virtual void OnIconChanged(int model_index);
 
  private:
   // IMPORTANT: Note about indices.
   //            Functions in this class deal in two index spaces:
   //            1. menu_index - the index of an item within the actual Windows
   //               native menu.
   //            2. model_index - the index of the item within our model.
   //            These two are most often but not always the same value! The
   //            notable exception is when this object is used to wrap the
   //            Windows System Menu. In this instance, the model indices start
@@ skipping 110 matching lines @@
   // Overridden from SimpleMenuModel:
   virtual int FlipIndex(int index) const { return GetItemCount() - index - 1; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemMenuModel);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_NATIVE_MENU_WIN_H_