Convert NativeTextFieldViews context menu from Menu2 to MenuItemView.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/focusable_border.h"
-#include "views/controls/menu/menu_2.h"
+#include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/textfield/text_style.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_controller.h"
 #include "views/controls/textfield/textfield_views_model.h"
 #include "views/events/event.h"
 #include "views/ime/input_method.h"
 #include "views/metrics.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
+#include "views/window/window.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 namespace {
 
 // A global flag to switch the Textfield wrapper to TextfieldViews.
 bool textfield_view_enabled = false;
 
@@ skipping 209 matching lines @@
 #else
   return text ? gfx::GetCursor(GDK_XTERM) : NULL;
 #endif
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, ContextMenuController overrides:
 void NativeTextfieldViews::ShowContextMenuForView(View* source,
                                                   const gfx::Point& p,
                                                   bool is_mouse_gesture) {
-  InitContextMenuIfRequired();
-  context_menu_menu_->RunContextMenuAt(p);
+  UpdateContextMenu();
+  context_menu_menu_->RunMenuAt(GetWindow()->GetNativeWindow(), NULL,

[oshima, 2011/06/07 17:21:44]

move NULL to next line

[rhashimoto, 2011/06/07 21:07:22]

Done.

+                                gfx::Rect(p, gfx::Size()),
+                                views::MenuItemView::TOPLEFT,
+                                true);
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, views::DragController overrides:
 void NativeTextfieldViews::WriteDragDataForView(views::View* sender,
                                                 const gfx::Point& press_pt,
                                                 OSExchangeData* data) {
   DCHECK_NE(ui::DragDropTypes::DRAG_NONE,
             GetDragOperationsForView(sender, press_pt));
   data->SetString(GetSelectedText());
@@ skipping 752 matching lines @@
   if (cursor_changed) {
     is_cursor_visible_ = true;
     RepaintCursor();
   }
   if (text_changed || cursor_changed) {
     UpdateCursorBoundsAndTextOffset();
     SchedulePaint();
   }
 }
 
-void NativeTextfieldViews::InitContextMenuIfRequired() {
-  if (context_menu_menu_.get())
-    return;
-  context_menu_contents_.reset(new ui::SimpleMenuModel(this));
-  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_->AddItemWithStringId(IDS_APP_DELETE, IDS_APP_DELETE);
-  context_menu_contents_->AddSeparator();
-  context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
-                                              IDS_APP_SELECT_ALL);
-  context_menu_menu_.reset(new Menu2(context_menu_contents_.get()));
+void NativeTextfieldViews::UpdateContextMenu() {
+  if (!context_menu_contents_.get()) {
+    context_menu_contents_.reset(new ui::SimpleMenuModel(this));
+    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_->AddItemWithStringId(IDS_APP_DELETE, IDS_APP_DELETE);
+    context_menu_contents_->AddSeparator();
+    context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
+                                                IDS_APP_SELECT_ALL);
+
+    context_menu_delegate_.reset(
+        new views::MenuModelAdapter(context_menu_contents_.get()));
+    context_menu_menu_.reset(
+        new views::MenuItemView(context_menu_delegate_.get()));
+  }
+
+  context_menu_delegate_->BuildMenu(context_menu_menu_.get());
 }
 
 void NativeTextfieldViews::OnTextInputTypeChanged() {
   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnTextInputTypeChanged(textfield_);
 }
 
 void NativeTextfieldViews::OnCaretBoundsChanged() {
   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
@@ skipping 31 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views