diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:59:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 02:59:26 +0000 |
| commit | 1dbc443f7ff46c32dbfee30f49d55f7fa192d92b (patch) | |
| tree | 41145148fca754ab2f8a86aa9d7db881edfa7bf9 /chrome/views/controls/text_field.cc | |
| parent | 6e5bac75a3e3b9f1d8dd2a73657ed2a8c0342382 (diff) | |
| download | chromium_src-1dbc443f7ff46c32dbfee30f49d55f7fa192d92b.zip chromium_src-1dbc443f7ff46c32dbfee30f49d55f7fa192d92b.tar.gz chromium_src-1dbc443f7ff46c32dbfee30f49d55f7fa192d92b.tar.bz2 | |
Reverting 15180.
Review URL: http://codereview.chromium.org/100323
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/controls/text_field.cc')
| -rw-r--r-- | chrome/views/controls/text_field.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc index 305bfd9..3d6bf55 100644 --- a/chrome/views/controls/text_field.cc +++ b/chrome/views/controls/text_field.cc @@ -290,18 +290,18 @@ TextField::Edit::Edit(TextField* parent, bool draw_border) text_object_model_ = ole_interface; context_menu_.reset(new Menu(this, Menu::TOPLEFT, m_hWnd)); - context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_UNDO, - l10n_util::GetString(IDS_VIEWS_UNDO)); + context_menu_->AppendMenuItemWithLabel(IDS_UNDO, + l10n_util::GetString(IDS_UNDO)); context_menu_->AppendSeparator(); - context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_CUT, - l10n_util::GetString(IDS_VIEWS_CUT)); - context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_COPY, - l10n_util::GetString(IDS_VIEWS_COPY)); - context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_PASTE, - l10n_util::GetString(IDS_VIEWS_PASTE)); + context_menu_->AppendMenuItemWithLabel(IDS_CUT, + l10n_util::GetString(IDS_CUT)); + context_menu_->AppendMenuItemWithLabel(IDS_COPY, + l10n_util::GetString(IDS_COPY)); + context_menu_->AppendMenuItemWithLabel(IDS_PASTE, + l10n_util::GetString(IDS_PASTE)); context_menu_->AppendSeparator(); - context_menu_->AppendMenuItemWithLabel(IDS_VIEWS_SELECT_ALL, - l10n_util::GetString(IDS_VIEWS_SELECT_ALL)); + context_menu_->AppendMenuItemWithLabel(IDS_SELECT_ALL, + l10n_util::GetString(IDS_SELECT_ALL)); } TextField::Edit::~Edit() { @@ -377,14 +377,14 @@ void TextField::Edit::SetBackgroundColor(COLORREF bg_color) { bool TextField::Edit::IsCommandEnabled(int id) const { switch (id) { - case IDS_VIEWS_UNDO: return !parent_->IsReadOnly() && !!CanUndo(); - case IDS_VIEWS_CUT: return !parent_->IsReadOnly() && - !parent_->IsPassword() && !!CanCut(); - case IDS_VIEWS_COPY: return !!CanCopy() && !parent_->IsPassword(); - case IDS_VIEWS_PASTE: return !parent_->IsReadOnly() && !!CanPaste(); - case IDS_VIEWS_SELECT_ALL: return !!CanSelectAll(); - default: NOTREACHED(); - return false; + case IDS_UNDO: return !parent_->IsReadOnly() && !!CanUndo(); + case IDS_CUT: return !parent_->IsReadOnly() && + !parent_->IsPassword() && !!CanCut(); + case IDS_COPY: return !!CanCopy() && !parent_->IsPassword(); + case IDS_PASTE: return !parent_->IsReadOnly() && !!CanPaste(); + case IDS_SELECT_ALL: return !!CanSelectAll(); + default: NOTREACHED(); + return false; } } @@ -392,12 +392,12 @@ void TextField::Edit::ExecuteCommand(int id) { ScopedFreeze freeze(this, GetTextObjectModel()); OnBeforePossibleChange(); switch (id) { - case IDS_VIEWS_UNDO: Undo(); break; - case IDS_VIEWS_CUT: Cut(); break; - case IDS_VIEWS_COPY: Copy(); break; - case IDS_VIEWS_PASTE: Paste(); break; - case IDS_VIEWS_SELECT_ALL: SelectAll(); break; - default: NOTREACHED(); break; + case IDS_UNDO: Undo(); break; + case IDS_CUT: Cut(); break; + case IDS_COPY: Copy(); break; + case IDS_PASTE: Paste(); break; + case IDS_SELECT_ALL: SelectAll(); break; + default: NOTREACHED(); break; } OnAfterPossibleChange(); } |