diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
commit | a4d271ecbea5ed763d49919fac7bfabe788832f6 (patch) | |
tree | c646a4d085142007968138c7ad26d1fb2aafe6a9 /chrome/test/automated_ui_tests | |
parent | 19ff283d0e043c59206fdc2e890a2780933849fe (diff) | |
download | chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.zip chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.gz chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.bz2 |
Reverting 27412 it breaks the toolkit views Linux build.
TBR=sky
Review URL: http://codereview.chromium.org/254005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
-rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_tests.cc | 3 | ||||
-rw-r--r-- | chrome/test/automated_ui_tests/automated_ui_tests.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index fd22151..252689c 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -607,8 +607,7 @@ bool AutomatedUITest::ForceCrash() { return true; } -bool AutomatedUITest::SimulateKeyPressInActiveWindow(base::KeyboardCode key, - int flags) { +bool AutomatedUITest::SimulateKeyPressInActiveWindow(wchar_t key, int flags) { scoped_refptr<WindowProxy> window(automation()->GetActiveWindow()); if (window.get() == NULL) { AddErrorAttribute("active_window_not_found"); diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.h b/chrome/test/automated_ui_tests/automated_ui_tests.h index 286234a..d370b70 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.h +++ b/chrome/test/automated_ui_tests/automated_ui_tests.h @@ -102,7 +102,6 @@ #include <string> -#include "base/keyboard_codes.h" #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" #include "chrome/test/ui/ui_test.h" @@ -294,7 +293,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(wchar_t key, int flags); // Opens init file, reads it into the reader, and closes the file. // Returns false if there are any errors. |