diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
commit | 92258389a1a4190987f3b4a64386fd9eb0f126ea (patch) | |
tree | 567ea0779660a7f822289f3c945721f2e9d6fad1 /chrome/browser/views/toolbar_view.cc | |
parent | 47fa280c2ff011bb948a9978687418079731a854 (diff) | |
download | chromium_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 'chrome/browser/views/toolbar_view.cc')
-rw-r--r-- | chrome/browser/views/toolbar_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index ccdc7e2..baa4fdd 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -353,13 +353,13 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id, // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings. switch (command_id) { case IDC_CUT: - *accelerator = views::Accelerator(app::VKEY_X, false, true, false); + *accelerator = views::Accelerator(base::VKEY_X, false, true, false); return true; case IDC_COPY: - *accelerator = views::Accelerator(app::VKEY_C, false, true, false); + *accelerator = views::Accelerator(base::VKEY_C, false, true, false); return true; case IDC_PASTE: - *accelerator = views::Accelerator(app::VKEY_V, false, true, false); + *accelerator = views::Accelerator(base::VKEY_V, false, true, false); return true; } // Else, we retrieve the accelerator information from the frame. |