Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: views/controls/textfield/native_textfield_views.h

Issue 7104013: Convert NativeTextFieldViews context menu from Menu2 to MenuItemView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implement reviewer recommendation. Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/textfield/native_textfield_views.h
diff --git a/views/controls/textfield/native_textfield_views.h b/views/controls/textfield/native_textfield_views.h
index 54c13fb8bf26cd55e382c5846bca0da44c38f869..7f221d555041337d1ddd1a919613fae127b88900 100644
--- a/views/controls/textfield/native_textfield_views.h
+++ b/views/controls/textfield/native_textfield_views.h
@@ -28,7 +28,8 @@ 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.
@@ -206,8 +207,8 @@ class NativeTextfieldViews : public View,
// 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();
@@ -266,7 +267,8 @@ class NativeTextfieldViews : public View,
// 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);
};
« no previous file with comments | « no previous file | views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698