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

views/controls/textfield/native_textfield_win.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_
 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_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 <vsstyle.h>
 
+#include "views/controls/menu/simple_menu_model.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 
 namespace views {
 
 class NativeViewHost;
 class Textfield;
 
 static const int kDefaultEditStyle = WS_CHILD | WS_VISIBLE;
 
 // TODO(beng): make a subclass of NativeControlWin instead.
 class NativeTextfieldWin
     : public CWindowImpl<NativeTextfieldWin, CRichEditCtrl,
                          CWinTraits<kDefaultEditStyle> >,
       public CRichEditCommands<NativeTextfieldWin>,
       public NativeTextfieldWrapper,
-      public Menu::Delegate {
+      public SimpleMenuModel::Delegate {
  public:
   DECLARE_WND_CLASS(L"ViewsTextfieldEdit");
 
   explicit NativeTextfieldWin(Textfield* parent);
   ~NativeTextfieldWin();
 
   // Overridden from NativeTextfieldWrapper:
   virtual std::wstring GetText() const;
   virtual void UpdateText();
   virtual void AppendText(const std::wstring& text);
   virtual std::wstring GetSelectedText() const;
   virtual void SelectAll();
   virtual void ClearSelection();
   virtual void UpdateBorder();
   virtual void UpdateBackgroundColor();
   virtual void UpdateReadOnly();
   virtual void UpdateFont();
   virtual void UpdateEnabled();
   virtual void SetHorizontalMargins(int left, int right);
   virtual void SetFocus();
   virtual View* GetView();
   virtual gfx::NativeView GetTestingHandle() const;
 
+  // Overridden from SimpleMenuModel::Delegate:
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
+  virtual bool GetAcceleratorForCommandId(int command_id,
+                                          Accelerator* accelerator);
+  virtual void ExecuteCommand(int command_id);
+
   // CWindowImpl
   BEGIN_MSG_MAP(Edit)
     MSG_WM_CHAR(OnChar)
     MSG_WM_CONTEXTMENU(OnContextMenu)
     MSG_WM_COPY(OnCopy)
     MSG_WM_CUT(OnCut)
     MESSAGE_HANDLER_EX(WM_IME_CHAR, OnImeChar)
     MESSAGE_HANDLER_EX(WM_IME_STARTCOMPOSITION, OnImeStartComposition)
     MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
     MESSAGE_HANDLER_EX(WM_IME_ENDCOMPOSITION, OnImeEndComposition)
     MSG_WM_KEYDOWN(OnKeyDown)
     MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk)
     MSG_WM_LBUTTONDOWN(OnLButtonDown)
     MSG_WM_LBUTTONUP(OnLButtonUp)
     MSG_WM_MBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_MOUSEMOVE(OnMouseMove)
     MSG_WM_MOUSELEAVE(OnMouseLeave)
     MESSAGE_HANDLER_EX(WM_MOUSEWHEEL, OnMouseWheel)
     MSG_WM_NCCALCSIZE(OnNCCalcSize)
     MSG_WM_NCPAINT(OnNCPaint)
     MSG_WM_RBUTTONDOWN(OnNonLButtonDown)
     MSG_WM_PASTE(OnPaste)
     MSG_WM_SETFOCUS(OnSetFocus)
     MSG_WM_SYSCHAR(OnSysChar)  // WM_SYSxxx == WM_xxx with ALT down
     MSG_WM_SYSKEYDOWN(OnKeyDown)
   END_MSG_MAP()
 
-  // Menu::Delegate
-  virtual bool IsCommandEnabled(int id) const;
-  virtual void ExecuteCommand(int 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 {
    public:
@@ skipping 53 matching lines @@
 
   // Sets whether the mouse is in the edit. As necessary this redraws the
   // edit.
   void SetContainsMouse(bool contains_mouse);
 
   // Getter for the text_object_model_, used by the ScopedFreeze class.  Note
   // that the pointer returned here is only valid as long as the Edit is still
   // alive.
   ITextDocument* GetTextObjectModel() const;
 
+  // Generates the contents of the context menu.
+  void BuildContextMenu();
+
   // The Textfield this object is bound to.
   Textfield* textfield_;
 
   // We need to know if the user triple-clicks, so track double click points
   // and times so we can see if subsequent clicks are actually triple clicks.
   bool tracking_double_click_;
   CPoint double_click_point_;
   DWORD double_click_time_;
 
   // Used to discard unnecessary WM_MOUSEMOVE events after the first such
   // unnecessary event.  See detailed comments in OnMouseMove().
   bool can_discard_mousemove_;
 
   // The text of this control before a possible change.
   std::wstring text_before_change_;
 
   // If true, the mouse is over the edit.
   bool contains_mouse_;
 
   static bool did_load_library_;
 
-  // The context menu for the edit.
-  scoped_ptr<Menu> context_menu_;
+  // The contents of the context menu for the edit.
+  scoped_ptr<SimpleMenuModel> context_menu_contents_;
+  scoped_ptr<Menu2> context_menu_;
 
   // Border insets.
   gfx::Insets content_insets_;
 
   // This interface is useful for accessing the CRichEditCtrl at a low level.
   mutable CComQIPtr<ITextDocument> text_object_model_;
 
   // The position and the length of the ongoing composition string.
   // These values are used for removing a composition string from a search
   // text to emulate Firefox.
   bool ime_discard_composition_;
   int ime_composition_start_;
   int ime_composition_length_;
 
   // TODO(beng): remove this when we are a subclass of NativeControlWin.
   NativeViewHost* container_view_;
 
   COLORREF bg_color_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_WIN_H_