summaryrefslogtreecommitdiffstats
path: root/views/controls/textfield/native_textfield_win.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:49:40 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 15:49:40 +0000
commit44cbd9e3734527f73a83f8a864be0bb5ccae0a7a (patch)
treea997fb0565558d63e0eab62b631ef984de3e9596 /views/controls/textfield/native_textfield_win.cc
parent0c1c047d641a599ffffa280ab50d564cedb3e436 (diff)
downloadchromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.zip
chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.gz
chromium_src-44cbd9e3734527f73a83f8a864be0bb5ccae0a7a.tar.bz2
Move models from app to ui/base/models
BUG=none TEST=none TBR=brettw git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/textfield/native_textfield_win.cc')
-rw-r--r--views/controls/textfield/native_textfield_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index e719f1f..63e3082 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -323,7 +323,7 @@ void NativeTextfieldWin::HandleWillLoseFocus() {
}
////////////////////////////////////////////////////////////////////////////////
-// NativeTextfieldWin, menus::SimpleMenuModel::Delegate implementation:
+// NativeTextfieldWin, ui::SimpleMenuModel::Delegate implementation:
bool NativeTextfieldWin::IsCommandIdChecked(int command_id) const {
return false;
@@ -343,7 +343,7 @@ bool NativeTextfieldWin::IsCommandIdEnabled(int command_id) const {
}
bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
- menus::Accelerator* accelerator) {
+ ui::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) {
@@ -1100,7 +1100,7 @@ ITextDocument* NativeTextfieldWin::GetTextObjectModel() const {
void NativeTextfieldWin::BuildContextMenu() {
if (context_menu_contents_.get())
return;
- context_menu_contents_.reset(new menus::SimpleMenuModel(this));
+ context_menu_contents_.reset(new ui::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);