diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
| commit | 2b7c9492e9a8794e2124da62bfce91fe3a1b2a77 (patch) | |
| tree | f13a5c7961e2655f63916216223d16fa86454a3d /chrome/browser/views/tab_contents | |
| parent | 010e37516995713253daa8df6f7ba1c2b12ccd1d (diff) | |
| download | chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.zip chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.gz chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.bz2 | |
Revert 58215 - 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
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tab_contents')
| -rw-r--r-- | chrome/browser/views/tab_contents/render_view_context_menu_views.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc index f2092c5..8efb30b 100644 --- a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h" +#include "app/keyboard_codes.h" #include "base/compiler_specific.h" -#include "base/keyboard_codes.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/profile.h" #include "grit/generated_resources.h" @@ -68,28 +68,28 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId( // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. switch (command_id) { case IDC_CONTENT_CONTEXT_UNDO: - *accel = views::Accelerator(base::VKEY_Z, false, true, false); + *accel = views::Accelerator(app::VKEY_Z, false, true, false); return true; case IDC_CONTENT_CONTEXT_REDO: // TODO(jcampan): should it be Ctrl-Y? - *accel = views::Accelerator(base::VKEY_Z, true, true, false); + *accel = views::Accelerator(app::VKEY_Z, true, true, false); return true; case IDC_CONTENT_CONTEXT_CUT: - *accel = views::Accelerator(base::VKEY_X, false, true, false); + *accel = views::Accelerator(app::VKEY_X, false, true, false); return true; case IDC_CONTENT_CONTEXT_COPY: - *accel = views::Accelerator(base::VKEY_C, false, true, false); + *accel = views::Accelerator(app::VKEY_C, false, true, false); return true; case IDC_CONTENT_CONTEXT_PASTE: - *accel = views::Accelerator(base::VKEY_V, false, true, false); + *accel = views::Accelerator(app::VKEY_V, false, true, false); return true; case IDC_CONTENT_CONTEXT_SELECTALL: - *accel = views::Accelerator(base::VKEY_A, false, true, false); + *accel = views::Accelerator(app::VKEY_A, false, true, false); return true; default: |