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

views/controls/textfield/native_textfield_win.cc

 // 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.
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/clipboard.h"
 #include "base/gfx/native_theme.h"
 #include "base/scoped_clipboard_writer.h"
@@ skipping 79 matching lines @@
   if (textfield_->style() & Textfield::STYLE_LOWERCASE) {
     DCHECK((textfield_->style() & Textfield::STYLE_PASSWORD) == 0);
     SetEditStyle(SES_LOWERCASE, SES_LOWERCASE);
   }
 
   // Set up the text_object_model_.
   CComPtr<IRichEditOle> ole_interface;
   ole_interface.Attach(GetOleInterface());
   text_object_model_ = ole_interface;
 
-  context_menu_.reset(new MenuWin(this, Menu::TOPLEFT, m_hWnd));
-  context_menu_->AppendMenuItemWithLabel(IDS_APP_UNDO,
-                                         l10n_util::GetString(IDS_APP_UNDO));
-  context_menu_->AppendSeparator();
-  context_menu_->AppendMenuItemWithLabel(IDS_APP_CUT,
-                                         l10n_util::GetString(IDS_APP_CUT));
-  context_menu_->AppendMenuItemWithLabel(IDS_APP_COPY,
-                                         l10n_util::GetString(IDS_APP_COPY));
-  context_menu_->AppendMenuItemWithLabel(IDS_APP_PASTE,
-                                         l10n_util::GetString(IDS_APP_PASTE));
-  context_menu_->AppendSeparator();
-  context_menu_->AppendMenuItemWithLabel(
-      IDS_APP_SELECT_ALL,
-      l10n_util::GetString(IDS_APP_SELECT_ALL));
-
   container_view_ = new NativeViewHost;
   textfield_->AddChildView(container_view_);
   container_view_->set_focus_view(textfield_);
   container_view_->Attach(m_hWnd);
 }
 
 NativeTextfieldWin::~NativeTextfieldWin() {
   if (IsWindow())
     DestroyWindow();
 }
@@ skipping 95 matching lines @@
 
 View* NativeTextfieldWin::GetView() {
   return container_view_;
 }
 
 gfx::NativeView NativeTextfieldWin::GetTestingHandle() const {
   return m_hWnd;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldWin, Menu::Delegate implementation:
+// NativeTextfieldWin, SimpleMenuModel::Delegate implementation:
 
-bool NativeTextfieldWin::IsCommandEnabled(int id) const {
-  switch (id) {
+bool NativeTextfieldWin::IsCommandIdChecked(int command_id) const {
+  return false;
+}
+
+bool NativeTextfieldWin::IsCommandIdEnabled(int command_id) const {
+  switch (command_id) {
     case IDS_APP_UNDO:       return !textfield_->read_only() && !!CanUndo();
     case IDS_APP_CUT:        return !textfield_->read_only() &&
-                                 !textfield_->IsPassword() && !!CanCut();
+                                    !textfield_->IsPassword() && !!CanCut();
     case IDS_APP_COPY:       return !!CanCopy() && !textfield_->IsPassword();
     case IDS_APP_PASTE:      return !textfield_->read_only() && !!CanPaste();
     case IDS_APP_SELECT_ALL: return !!CanSelectAll();
     default:                 NOTREACHED();
                              return false;
   }
 }
 
-void NativeTextfieldWin::ExecuteCommand(int id) {
+bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
+                                                    Accelerator* accelerator) {
+  // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
+  // anywhere so we need to check for them explicitly here.
+  switch (command_id) {
+    case IDS_APP_CUT:
+      *accelerator = views::Accelerator(L'X', false, true, false);
+      return true;
+    case IDS_APP_COPY:
+      *accelerator = views::Accelerator(L'C', false, true, false);
+      return true;
+    case IDS_APP_PASTE:
+      *accelerator = views::Accelerator(L'V', false, true, false);
+      return true;
+  }
+  return container_view_->GetWidget()->GetAccelerator(command_id, accelerator);
+}
+
+void NativeTextfieldWin::ExecuteCommand(int command_id) {
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
-  switch (id) {
+  switch (command_id) {
     case IDS_APP_UNDO:       Undo();       break;
     case IDS_APP_CUT:        Cut();        break;
     case IDS_APP_COPY:       Copy();       break;
     case IDS_APP_PASTE:      Paste();      break;
     case IDS_APP_SELECT_ALL: SelectAll();  break;
     default:                 NOTREACHED(); break;
   }
   OnAfterPossibleChange();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWin, private:
 
 void NativeTextfieldWin::OnChar(TCHAR ch, UINT repeat_count, UINT flags) {
   HandleKeystroke(GetCurrentMessage()->message, ch, repeat_count, flags);
 }
 
 void NativeTextfieldWin::OnContextMenu(HWND window, const CPoint& point) {
   CPoint p(point);
   if (point.x == -1 || point.y == -1) {
     GetCaretPos(&p);
     MapWindowPoints(HWND_DESKTOP, &p, 1);
   }
-  context_menu_->RunMenuAt(p.x, p.y);
+  BuildContextMenu();
+  context_menu_->RunContextMenuAt(gfx::Point(p));
 }
 
 void NativeTextfieldWin::OnCopy() {
   if (textfield_->IsPassword())
     return;
 
   const std::wstring text(GetSelectedText());
 
   if (!text.empty() && ViewsDelegate::views_delegate) {
     ScopedClipboardWriter scw(ViewsDelegate::views_delegate->GetClipboard());
@@ skipping 547 matching lines @@
 
 ITextDocument* NativeTextfieldWin::GetTextObjectModel() const {
   if (!text_object_model_) {
     CComPtr<IRichEditOle> ole_interface;
     ole_interface.Attach(GetOleInterface());
     text_object_model_ = ole_interface;
   }
   return text_object_model_;
 }
 
+void NativeTextfieldWin::BuildContextMenu() {
+  if (context_menu_contents_.get())
+    return;
+  context_menu_contents_.reset(new SimpleMenuModel(this));
+  context_menu_contents_->AddItemWithStringId(IDS_APP_UNDO, IDS_APP_UNDO);
+  context_menu_contents_->AddSeparator();
+  context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
+  context_menu_contents_->AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
+  context_menu_contents_->AddItemWithStringId(IDS_APP_PASTE, IDS_APP_PASTE);
+  context_menu_contents_->AddSeparator();
+  context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
+                                              IDS_APP_SELECT_ALL);
+  context_menu_.reset(new Menu2(context_menu_contents_.get()));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views