| Index: chrome/test/ui_test_utils.h
|
| ===================================================================
|
| --- chrome/test/ui_test_utils.h (revision 71220)
|
| +++ chrome/test/ui_test_utils.h (working copy)
|
| @@ -11,7 +11,6 @@
|
| #include <string>
|
| #include <set>
|
|
|
| -#include "app/keyboard_codes.h"
|
| #include "base/basictypes.h"
|
| #include "base/message_loop.h"
|
| #include "base/scoped_temp_dir.h"
|
| @@ -24,6 +23,7 @@
|
| #include "chrome/test/automation/dom_element_proxy.h"
|
| #include "gfx/native_widget_types.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "ui/base/keycodes/keyboard_codes.h"
|
| #include "webkit/glue/window_open_disposition.h"
|
|
|
| class AppModalDialog;
|
| @@ -257,7 +257,7 @@
|
| // out. This uses ui_controls::SendKeyPress, see it for details. Returns true
|
| // if the event was successfully sent and received.
|
| bool SendKeyPressSync(const Browser* browser,
|
| - app::KeyboardCode key,
|
| + ui::KeyboardCode key,
|
| bool control,
|
| bool shift,
|
| bool alt,
|
| @@ -268,7 +268,7 @@
|
| // ui_controls::SendKeyPress, see it for details. Returns true if the event was
|
| // successfully sent and both the event and notification were received.
|
| bool SendKeyPressAndWait(const Browser* browser,
|
| - app::KeyboardCode key,
|
| + ui::KeyboardCode key,
|
| bool control,
|
| bool shift,
|
| bool alt,
|
| @@ -474,7 +474,7 @@
|
| template <class U>
|
| bool SendKeyPressAndWaitWithDetails(
|
| const Browser* browser,
|
| - app::KeyboardCode key,
|
| + ui::KeyboardCode key,
|
| bool control,
|
| bool shift,
|
| bool alt,
|
| @@ -486,7 +486,7 @@
|
| template <class U>
|
| bool SendKeyPressAndWaitWithDetails(
|
| const Browser* browser,
|
| - app::KeyboardCode key,
|
| + ui::KeyboardCode key,
|
| bool control,
|
| bool shift,
|
| bool alt,
|
|
|