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/accelerator.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/accelerator.cc')
-rw-r--r-- | chrome/views/accelerator.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc index e9ff76a..ef2dcd0 100644 --- a/chrome/views/accelerator.cc +++ b/chrome/views/accelerator.cc @@ -17,37 +17,37 @@ std::wstring Accelerator::GetShortcutText() const { int string_id = 0; switch(key_code_) { case VK_TAB: - string_id = IDS_VIEWS_TAB_KEY; + string_id = IDS_TAB_KEY; break; case VK_RETURN: - string_id = IDS_VIEWS_ENTER_KEY; + string_id = IDS_ENTER_KEY; break; case VK_ESCAPE: - string_id = IDS_VIEWS_ESC_KEY; + string_id = IDS_ESC_KEY; break; case VK_PRIOR: - string_id = IDS_VIEWS_PAGEUP_KEY; + string_id = IDS_PAGEUP_KEY; break; case VK_NEXT: - string_id = IDS_VIEWS_PAGEDOWN_KEY; + string_id = IDS_PAGEDOWN_KEY; break; case VK_END: - string_id = IDS_VIEWS_END_KEY; + string_id = IDS_END_KEY; break; case VK_HOME: - string_id = IDS_VIEWS_HOME_KEY; + string_id = IDS_HOME_KEY; break; case VK_INSERT: - string_id = IDS_VIEWS_INSERT_KEY; + string_id = IDS_INSERT_KEY; break; case VK_DELETE: - string_id = IDS_VIEWS_DELETE_KEY; + string_id = IDS_DELETE_KEY; break; case VK_F1: - string_id = IDS_VIEWS_F1_KEY; + string_id = IDS_F1_KEY; break; case VK_F11: - string_id = IDS_VIEWS_F11_KEY; + string_id = IDS_F11_KEY; break; } @@ -84,15 +84,15 @@ std::wstring Accelerator::GetShortcutText() const { } if (IsShiftDown()) - shortcut = l10n_util::GetStringF(IDS_VIEWS_SHIFT_MODIFIER, shortcut); + shortcut = l10n_util::GetStringF(IDS_SHIFT_MODIFIER, shortcut); // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut. // See http://blogs.msdn.com/oldnewthing/archive/2004/03/29/101121.aspx for // more information. if (IsCtrlDown()) - shortcut = l10n_util::GetStringF(IDS_VIEWS_CONTROL_MODIFIER, shortcut); + shortcut = l10n_util::GetStringF(IDS_CONTROL_MODIFIER, shortcut); else if (IsAltDown()) - shortcut = l10n_util::GetStringF(IDS_VIEWS_ALT_MODIFIER, shortcut); + shortcut = l10n_util::GetStringF(IDS_ALT_MODIFIER, shortcut); // For some reason, menus in Windows ignore standard Unicode directionality // marks (such as LRE, PDF, etc.). On RTL locales, we use RTL menus and |