summaryrefslogtreecommitdiffstats
path: root/views/accelerator.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
commit92258389a1a4190987f3b4a64386fd9eb0f126ea (patch)
tree567ea0779660a7f822289f3c945721f2e9d6fad1 /views/accelerator.cc
parent47fa280c2ff011bb948a9978687418079731a854 (diff)
downloadchromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2
Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.cc')
-rw-r--r--views/accelerator.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/views/accelerator.cc b/views/accelerator.cc
index 6b80cc4..730191d 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -22,46 +22,46 @@ namespace views {
std::wstring Accelerator::GetShortcutText() const {
int string_id = 0;
switch(key_code_) {
- case app::VKEY_TAB:
+ case base::VKEY_TAB:
string_id = IDS_APP_TAB_KEY;
break;
- case app::VKEY_RETURN:
+ case base::VKEY_RETURN:
string_id = IDS_APP_ENTER_KEY;
break;
- case app::VKEY_ESCAPE:
+ case base::VKEY_ESCAPE:
string_id = IDS_APP_ESC_KEY;
break;
- case app::VKEY_PRIOR:
+ case base::VKEY_PRIOR:
string_id = IDS_APP_PAGEUP_KEY;
break;
- case app::VKEY_NEXT:
+ case base::VKEY_NEXT:
string_id = IDS_APP_PAGEDOWN_KEY;
break;
- case app::VKEY_END:
+ case base::VKEY_END:
string_id = IDS_APP_END_KEY;
break;
- case app::VKEY_HOME:
+ case base::VKEY_HOME:
string_id = IDS_APP_HOME_KEY;
break;
- case app::VKEY_INSERT:
+ case base::VKEY_INSERT:
string_id = IDS_APP_INSERT_KEY;
break;
- case app::VKEY_DELETE:
+ case base::VKEY_DELETE:
string_id = IDS_APP_DELETE_KEY;
break;
- case app::VKEY_LEFT:
+ case base::VKEY_LEFT:
string_id = IDS_APP_LEFT_ARROW_KEY;
break;
- case app::VKEY_RIGHT:
+ case base::VKEY_RIGHT:
string_id = IDS_APP_RIGHT_ARROW_KEY;
break;
- case app::VKEY_BACK:
+ case base::VKEY_BACK:
string_id = IDS_APP_BACKSPACE_KEY;
break;
- case app::VKEY_F1:
+ case base::VKEY_F1:
string_id = IDS_APP_F1_KEY;
break;
- case app::VKEY_F11:
+ case base::VKEY_F11:
string_id = IDS_APP_F11_KEY;
break;
default: