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

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

Issue 6287002: Fix for broken build (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 11 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
Index: views/controls/textfield/native_textfield_views.cc
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 497f076cce521b75f425609b48fe04847c2b532b..60589d229090235068af5680084ec849796437ec 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -310,7 +310,7 @@ void NativeTextfieldViews::HandleWillLoseFocus() {
}
/////////////////////////////////////////////////////////////////
-// NativeTextfieldViews, menus::SimpleMenuModel::Delegate overrides:
+// NativeTextfieldViews, ui::SimpleMenuModel::Delegate overrides:
bool NativeTextfieldViews::IsCommandIdChecked(int command_id) const {
return true;
@@ -338,7 +338,7 @@ bool NativeTextfieldViews::IsCommandIdEnabled(int command_id) const {
}
bool NativeTextfieldViews::GetAcceleratorForCommandId(int command_id,
- menus::Accelerator* accelerator) {
+ ui::Accelerator* accelerator) {
return false;
}
@@ -772,7 +772,7 @@ void NativeTextfieldViews::PropagateTextChange() {
void NativeTextfieldViews::InitContextMenuIfRequired() {
if (context_menu_menu_.get())
return;
- context_menu_contents_.reset(new menus::SimpleMenuModel(this));
+ 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);
« no previous file with comments | « views/controls/textfield/native_textfield_views.h ('k') | views/controls/textfield/native_textfield_views_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698