Convert NativeTextFieldViews context menu from Menu2 to MenuItemView.

views/controls/textfield/native_textfield_views.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #define VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #pragma once
 
 #include "base/string16.h"
 #include "base/task.h"
@@ skipping 10 matching lines @@
 }
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 
 class FocusableBorder;
 class KeyEvent;
-class Menu2;
+class MenuItemView;
+class MenuModelAdapter;
 
 // A views/skia only implementation of NativeTextfieldWrapper.
 // No platform specific code is used.
 // Following features are not yet supported.
 // * BIDI/Complex script.
 // * Support surrogate pair, or maybe we should just use UTF32 internally.
 // * X selection (only if we want to support).
 // Once completed, this will replace Textfield, NativeTextfieldWin and
 // NativeTextfieldGtk.
 class NativeTextfieldViews : public View,
@@ skipping 157 matching lines @@
   bool MoveCursorTo(const gfx::Point& point, bool select);
 
   // Utility function to inform the parent textfield (and its controller if any)
   // that the text in the textfield has changed.
   void PropagateTextChange();
 
   // Does necessary updates when the text and/or the position of the cursor
   // changed.
   void UpdateAfterChange(bool text_changed, bool cursor_changed);
 
-  // Utility function to create the context menu if one does not already exist.
-  void InitContextMenuIfRequired();
+  // Utility function to prepare the context menu..
+  void UpdateContextMenu();
 
   // Convenience method to call InputMethod::OnTextInputTypeChanged();
   void OnTextInputTypeChanged();
 
   // Convenience method to call InputMethod::OnCaretBoundsChanged();
   void OnCaretBoundsChanged();
 
   // Convenience method to call TextfieldController::OnBeforeUserAction();
   void OnBeforeUserAction();
 
@@ skipping 38 matching lines @@
   // A runnable method factory for callback to update the cursor.
   ScopedRunnableMethodFactory<NativeTextfieldViews> cursor_timer_;
 
   // State variables used to track double and triple clicks.
   size_t aggregated_clicks_;
   base::Time last_click_time_;
   gfx::Point last_click_location_;
 
   // Context menu and its content list for the textfield.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
-  scoped_ptr<Menu2> context_menu_menu_;
+  scoped_ptr<views::MenuModelAdapter> context_menu_delegate_;
+  scoped_ptr<views::MenuItemView> context_menu_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_