From 7f05552488f8f9ea5000512fd1972894aee7ee82 Mon Sep 17 00:00:00 2001 From: "bryeung@chromium.org" Date: Fri, 3 Sep 2010 00:38:27 +0000 Subject: Re-lands 58186: Original message: """ 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=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/automated_ui_tests/automated_ui_tests.cc | 20 ++++++++++---------- chrome/test/automated_ui_tests/automated_ui_tests.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'chrome/test/automated_ui_tests') diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index 1aad575..759c84c7 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -6,10 +6,10 @@ #include #include +#include "app/keyboard_codes.h" #include "base/command_line.h" #include "base/environment.h" #include "base/file_util.h" -#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/path_service.h" #include "base/rand_util.h" @@ -486,35 +486,35 @@ bool AutomatedUITest::Options() { } bool AutomatedUITest::PressDownArrow() { - return SimulateKeyPressInActiveWindow(base::VKEY_DOWN, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_DOWN, 0); } bool AutomatedUITest::PressEnterKey() { - return SimulateKeyPressInActiveWindow(base::VKEY_RETURN, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_RETURN, 0); } bool AutomatedUITest::PressEscapeKey() { - return SimulateKeyPressInActiveWindow(base::VKEY_ESCAPE, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_ESCAPE, 0); } bool AutomatedUITest::PressPageDown() { - return SimulateKeyPressInActiveWindow(base::VKEY_PRIOR, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_PRIOR, 0); } bool AutomatedUITest::PressPageUp() { - return SimulateKeyPressInActiveWindow(base::VKEY_NEXT, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_NEXT, 0); } bool AutomatedUITest::PressSpaceBar() { - return SimulateKeyPressInActiveWindow(base::VKEY_SPACE, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_SPACE, 0); } bool AutomatedUITest::PressTabKey() { - return SimulateKeyPressInActiveWindow(base::VKEY_TAB, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_TAB, 0); } bool AutomatedUITest::PressUpArrow() { - return SimulateKeyPressInActiveWindow(base::VKEY_UP, 0); + return SimulateKeyPressInActiveWindow(app::VKEY_UP, 0); } bool AutomatedUITest::StarPage() { @@ -604,7 +604,7 @@ bool AutomatedUITest::ForceCrash() { return true; } -bool AutomatedUITest::SimulateKeyPressInActiveWindow(base::KeyboardCode key, +bool AutomatedUITest::SimulateKeyPressInActiveWindow(app::KeyboardCode key, int flags) { scoped_refptr window(automation()->GetActiveWindow()); if (window.get() == NULL) { diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.h b/chrome/test/automated_ui_tests/automated_ui_tests.h index d26675c..ef7b1f3 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.h +++ b/chrome/test/automated_ui_tests/automated_ui_tests.h @@ -103,7 +103,7 @@ #include -#include "base/keyboard_codes.h" +#include "app/keyboard_codes.h" #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" #include "chrome/test/ui/ui_test.h" @@ -295,7 +295,7 @@ class AutomatedUITest : public AutomatedUITestBase { // Calls SimulateOSKeyPress on the active window. Simulates a key press at // the OS level. |key| is the key pressed and |flags| specifies which // modifiers keys are also pressed (as defined in chrome/views/event.h). - bool SimulateKeyPressInActiveWindow(base::KeyboardCode key, int flags); + bool SimulateKeyPressInActiveWindow(app::KeyboardCode key, int flags); // Opens init file, reads it into the reader, and closes the file. // Returns false if there are any errors. -- cgit v1.1