Begin to upgrade BackForwardMenuModelViews to use new menu API....

chrome/browser/back_forward_menu_model_views.h

Index: chrome/browser/back_forward_menu_model_views.h
===================================================================
--- chrome/browser/back_forward_menu_model_views.h	(revision 18347)
+++ chrome/browser/back_forward_menu_model_views.h	(working copy)
@@ -8,27 +8,45 @@
 #include "base/basictypes.h"
 
 #include "chrome/browser/back_forward_menu_model.h"
-#include "views/controls/menu/menu.h"
+#include "views/controls/menu/menu_2.h"
 
 class SkBitmap;
 
+namespace views {
+class Widget;
+}
+
 class BackForwardMenuModelViews : public BackForwardMenuModel,
-                                  public views::Menu::Delegate {
+                                  public views::Menu2Model {
  public:
-  BackForwardMenuModelViews(Browser* browser, ModelType model_type);
+  // Construct a BackForwardMenuModel. |frame| is used to locate the accelerator
+  // for the history item.
+  BackForwardMenuModelViews(Browser* browser,
+                            ModelType model_type,
+                            views::Widget* frame);
 
-  // Menu::Delegate
-  virtual std::wstring GetLabel(int menu_id) const;
-  virtual const SkBitmap& GetIcon(int menu_id) const;
-  virtual bool SupportsCommand(int menu_id) const;
-  virtual bool IsCommandEnabled(int menu_id) const;
-  virtual bool IsItemSeparator(int menu_id) const;
-  virtual bool HasIcon(int menu_id) const;
-  virtual void ExecuteCommand(int menu_id);
+  // Overridden from views::Menu2Model:
+  virtual bool HasIcons() const;
+  virtual int GetItemCount() const;
+  virtual ItemType GetTypeAt(int index) const;
+  virtual int GetCommandIdAt(int index) const;
+  virtual std::wstring GetLabelAt(int index) const;
+  virtual bool IsLabelDynamicAt(int index) const;
+  virtual bool GetAcceleratorAt(int index,
+                                views::Accelerator* accelerator) const;
+  virtual bool IsItemCheckedAt(int index) const;
+  virtual int GetGroupIdAt(int index) const;
+  virtual bool GetIconAt(int index, SkBitmap* icon) const;
+  virtual bool IsEnabledAt(int index) const;
+  virtual Menu2Model* GetSubmenuModelAt(int index) const;
+  virtual void HighlightChangedTo(int index);
+  virtual void ActivatedAt(int index);
   virtual void MenuWillShow();
-  virtual int GetItemCount() const;
 
  private:
+  // The frame we ask about accelerator info.
+  views::Widget* frame_;
+
   DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModelViews);
 };