Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/autocomplete/autocomplete_edit_view_win.h

 // Copyright (c) 2006-2008 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 CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlctrls.h>
 #include <atlmisc.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl.
 
 #include "app/gfx/font.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/common/page_transition_types.h"
-#include "views/controls/menu/menu.h"
+#include "views/controls/menu/simple_menu_model.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompletePopupModel;
 class CommandUpdater;
 class Profile;
 class TabContents;
 namespace views {
 class View;
 }
 
 class AutocompleteEditController;
 class AutocompleteEditModel;
 class AutocompleteEditView;
 class AutocompletePopupView;
 
 // Provides the implementation of an edit control with a drop-down
 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
 // This file implements the edit box and management for the popup.
 class AutocompleteEditViewWin
     : public CWindowImpl<AutocompleteEditViewWin,
                          CRichEditCtrl,
                          CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
                                     ES_NOHIDESEL> >,
       public CRichEditCommands<AutocompleteEditViewWin>,
-      public views::Menu::Delegate,
+      public views::SimpleMenuModel::Delegate,
       public AutocompleteEditView {
  public:
   struct State {
     State(const CHARRANGE& selection,
           const CHARRANGE& saved_selection_for_focus_change)
         : selection(selection),
           saved_selection_for_focus_change(saved_selection_for_focus_change) {
     }
 
     const CHARRANGE selection;
@@ skipping 114 matching lines @@
     MSG_WM_RBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_RBUTTONUP(OnNonLButtonUp)
     MSG_WM_SETFOCUS(OnSetFocus)
     MSG_WM_SYSCHAR(OnSysChar)  // WM_SYSxxx == WM_xxx with ALT down
     MSG_WM_SYSKEYDOWN(OnKeyDown)
     MSG_WM_SYSKEYUP(OnKeyUp)
     MSG_WM_WINDOWPOSCHANGING(OnWindowPosChanging)
     DEFAULT_REFLECTION_HANDLER()  // avoids black margin area
   END_MSG_MAP()
 
-  // Menu::Delegate
-  virtual bool IsCommandEnabled(int id) const;
-  virtual bool GetContextualLabel(int id, std::wstring* out) const;
-  virtual void ExecuteCommand(int id);
+  // SimpleMenuModel::Delegate
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
+  virtual bool GetAcceleratorForCommandId(int command_id,
+                                          views::Accelerator* accelerator);
+  virtual bool IsLabelForCommandIdDynamic(int command_id) const;
+  virtual std::wstring GetLabelForCommandId(int command_id) const;
+  virtual void ExecuteCommand(int command_id);
 
  private:
   // This object freezes repainting of the edit until the object is destroyed.
   // Some methods of the CRichEditCtrl draw synchronously to the screen.  If we
   // don't freeze, the user will see a rapid series of calls to these as
   // flickers.
   //
   // Freezing the control while it is already frozen is permitted; the control
   // will unfreeze once both freezes are released (the freezes stack).
   class ScopedFreeze {
@@ skipping 154 matching lines @@
 
   // Invoked when a mouse button is released. If none of the buttons are still
   // down, this sets possible_drag_ to false.
   void UpdateDragDone(UINT keys);
 
   // Redraws the necessary region for a drop highlight at the specified
   // position. This does nothing if position is beyond the bounds of the
   // text.
   void RepaintDropHighlight(int position);
 
+  // Generates the context menu for the edit field.
+  void BuildContextMenu();
+
   scoped_ptr<AutocompleteEditModel> model_;
 
   scoped_ptr<AutocompletePopupView> popup_view_;
 
   AutocompleteEditController* controller_;
 
   // The parent view for the edit, used to align the popup and for
   // accessibility.
   views::View* parent_view_;
 
@@ skipping 49 matching lines @@
 
   // Set at the same time the model's original_* members are set, and valid in
   // the same cases.
   CHARRANGE original_selection_;
 
   // Holds the user's selection across focus changes.  cpMin holds -1 when
   // there is no saved selection.
   CHARRANGE saved_selection_for_focus_change_;
 
   // The context menu for the edit.
-  scoped_ptr<views::Menu> context_menu_;
+  scoped_ptr<views::SimpleMenuModel> context_menu_contents_;
+  scoped_ptr<views::Menu2> context_menu_;
 
   // Font we're using.  We keep a reference to make sure the font supplied to
   // the constructor doesn't go away before we do.
   gfx::Font font_;
 
   // Metrics about the font, which we keep so we don't need to recalculate them
   // every time we paint.  |font_y_adjustment_| is the number of pixels we need
   // to shift the font vertically in order to make its baseline be at our
   // desired baseline in the edit.
   int font_ascent_;
@@ skipping 27 matching lines @@
   // striken-out when displaying an insecure scheme.
   url_parse::Component insecure_scheme_component_;
 
   // Instance of accessibility information and handling.
   mutable CComPtr<IAccessible> autocomplete_accessibility_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewWin);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_WIN_H_