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/renderer/render_view_browsertest.cc | |
| 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/renderer/render_view_browsertest.cc')
| -rw-r--r-- | chrome/renderer/render_view_browsertest.cc | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/chrome/renderer/render_view_browsertest.cc b/chrome/renderer/render_view_browsertest.cc index 35cdb6d..531aae7 100644 --- a/chrome/renderer/render_view_browsertest.cc +++ b/chrome/renderer/render_view_browsertest.cc @@ -4,8 +4,8 @@ #include "base/basictypes.h" +#include "app/keyboard_codes.h" #include "base/file_util.h" -#include "base/keyboard_codes.h" #include "base/shared_memory.h" #include "base/utf_string_conversions.h" #include "chrome/common/content_settings.h" @@ -578,20 +578,20 @@ TEST_F(RenderViewTest, OnHandleKeyboardEvent) { 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - base::VKEY_OEM_1, - base::VKEY_OEM_PLUS, - base::VKEY_OEM_COMMA, - base::VKEY_OEM_MINUS, - base::VKEY_OEM_PERIOD, - base::VKEY_OEM_2, - base::VKEY_OEM_3, - base::VKEY_OEM_4, - base::VKEY_OEM_5, - base::VKEY_OEM_6, - base::VKEY_OEM_7, + app::VKEY_OEM_1, + app::VKEY_OEM_PLUS, + app::VKEY_OEM_COMMA, + app::VKEY_OEM_MINUS, + app::VKEY_OEM_PERIOD, + app::VKEY_OEM_2, + app::VKEY_OEM_3, + app::VKEY_OEM_4, + app::VKEY_OEM_5, + app::VKEY_OEM_6, + app::VKEY_OEM_7, #if defined(OS_WIN) // Not sure how to handle this key on Linux. - base::VKEY_OEM_8, + app::VKEY_OEM_8, #endif }; @@ -817,20 +817,20 @@ TEST_F(RenderViewTest, InsertCharacters) { 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', - base::VKEY_OEM_1, - base::VKEY_OEM_PLUS, - base::VKEY_OEM_COMMA, - base::VKEY_OEM_MINUS, - base::VKEY_OEM_PERIOD, - base::VKEY_OEM_2, - base::VKEY_OEM_3, - base::VKEY_OEM_4, - base::VKEY_OEM_5, - base::VKEY_OEM_6, - base::VKEY_OEM_7, + app::VKEY_OEM_1, + app::VKEY_OEM_PLUS, + app::VKEY_OEM_COMMA, + app::VKEY_OEM_MINUS, + app::VKEY_OEM_PERIOD, + app::VKEY_OEM_2, + app::VKEY_OEM_3, + app::VKEY_OEM_4, + app::VKEY_OEM_5, + app::VKEY_OEM_6, + app::VKEY_OEM_7, #if defined(OS_WIN) // Unclear how to handle this on Linux. - base::VKEY_OEM_8, + app::VKEY_OEM_8, #endif }; |