summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc1
-rw-r--r--chrome/browser/automation/automation_provider_win.cc4
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc2
-rw-r--r--chrome/browser/automation/ui_controls.h6
-rw-r--r--chrome/browser/automation/ui_controls_linux.cc8
-rw-r--r--chrome/browser/automation/ui_controls_mac.mm32
-rw-r--r--chrome/browser/automation/ui_controls_win.cc29
7 files changed, 41 insertions, 41 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 8a27a77..e2f5d12 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -12,6 +12,7 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
#include "base/json/string_escape.h"
+#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/process_util.h"
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index 3495991..41994e8 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/automation/automation_provider.h"
-#include "app/keyboard_codes.h"
#include "base/json/json_reader.h"
+#include "base/keyboard_codes.h"
#include "base/trace_event.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/automation/automation_browser_tracker.h"
@@ -200,7 +200,7 @@ void AutomationProvider::WindowSimulateDrag(int handle,
if (press_escape_en_route) {
// Press Escape.
- ui_controls::SendKeyPress(window, app::VKEY_ESCAPE,
+ ui_controls::SendKeyPress(window, base::VKEY_ESCAPE,
((flags & views::Event::EF_CONTROL_DOWN)
== views::Event::EF_CONTROL_DOWN),
((flags & views::Event::EF_SHIFT_DOWN) ==
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index fd1acf5..a8ef344b 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -878,7 +878,7 @@ void TestingAutomationProvider::WindowSimulateKeyPress(
gfx::NativeWindow window = window_tracker_->GetResource(handle);
// The key event is sent to whatever window is active.
- ui_controls::SendKeyPress(window, static_cast<app::KeyboardCode>(key),
+ ui_controls::SendKeyPress(window, static_cast<base::KeyboardCode>(key),
((flags & views::Event::EF_CONTROL_DOWN) ==
views::Event::EF_CONTROL_DOWN),
((flags & views::Event::EF_SHIFT_DOWN) ==
diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h
index 3664567..2b26dfe 100644
--- a/chrome/browser/automation/ui_controls.h
+++ b/chrome/browser/automation/ui_controls.h
@@ -12,7 +12,7 @@
#include <wtypes.h>
#endif
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
#include "gfx/native_widget_types.h"
#include "gfx/point.h"
@@ -46,13 +46,13 @@ namespace ui_controls {
// If you're writing a test chances are you want the variant in ui_test_utils.
// See it for details.
bool SendKeyPress(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control,
bool shift,
bool alt,
bool command);
bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control,
bool shift,
bool alt,
diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc
index a2dd0ae..bdf71df 100644
--- a/chrome/browser/automation/ui_controls_linux.cc
+++ b/chrome/browser/automation/ui_controls_linux.cc
@@ -7,8 +7,8 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "app/event_synthesis_gtk.h"
#include "gfx/rect.h"
+#include "base/event_synthesis_gtk.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "chrome/browser/automation/ui_controls_internal.h"
@@ -96,7 +96,7 @@ void FakeAMouseMotionEvent(gint x, gint y) {
namespace ui_controls {
bool SendKeyPress(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control, bool shift, bool alt, bool command) {
DCHECK(command == false); // No command key on Linux
GdkWindow* event_window = NULL;
@@ -124,7 +124,7 @@ bool SendKeyPress(gfx::NativeWindow window,
}
std::vector<GdkEvent*> events;
- app::SynthesizeKeyPressEvents(event_window, key, control, shift, alt,
+ base::SynthesizeKeyPressEvents(event_window, key, control, shift, alt,
&events);
for (std::vector<GdkEvent*>::iterator iter = events.begin();
iter != events.end(); ++iter) {
@@ -137,7 +137,7 @@ bool SendKeyPress(gfx::NativeWindow window,
}
bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control, bool shift,
bool alt, bool command,
Task* task) {
diff --git a/chrome/browser/automation/ui_controls_mac.mm b/chrome/browser/automation/ui_controls_mac.mm
index 5edfa5d..d95dbc2 100644
--- a/chrome/browser/automation/ui_controls_mac.mm
+++ b/chrome/browser/automation/ui_controls_mac.mm
@@ -8,7 +8,7 @@
#include <mach/mach_time.h>
#include <vector>
-#include "app/keyboard_code_conversion_mac.h"
+#include "base/keyboard_code_conversion_mac.h"
#include "base/message_loop.h"
#include "chrome/browser/automation/ui_controls_internal.h"
#include "chrome/browser/chrome_thread.h"
@@ -76,11 +76,11 @@ NSTimeInterval TimeIntervalSinceSystemStartup() {
// Creates and returns an autoreleased key event.
NSEvent* SynthesizeKeyEvent(NSWindow* window,
bool keyDown,
- app::KeyboardCode keycode,
+ base::KeyboardCode keycode,
NSUInteger flags) {
unichar character;
unichar characterIgnoringModifiers;
- int macKeycode = app::MacKeyCodeForWindowsKeyCode(
+ int macKeycode = base::MacKeyCodeForWindowsKeyCode(
keycode, flags, &character, &characterIgnoringModifiers);
if (macKeycode < 0)
@@ -97,8 +97,8 @@ NSEvent* SynthesizeKeyEvent(NSWindow* window,
// Modifier keys generate NSFlagsChanged event rather than
// NSKeyDown/NSKeyUp events.
- if (keycode == app::VKEY_CONTROL || keycode == app::VKEY_SHIFT ||
- keycode == app::VKEY_MENU || keycode == app::VKEY_COMMAND)
+ if (keycode == base::VKEY_CONTROL || keycode == base::VKEY_SHIFT ||
+ keycode == base::VKEY_MENU || keycode == base::VKEY_COMMAND)
type = NSFlagsChanged;
// For events other than mouse moved, [event locationInWindow] is
@@ -121,7 +121,7 @@ NSEvent* SynthesizeKeyEvent(NSWindow* window,
// Creates the proper sequence of autoreleased key events for a key down + up.
void SynthesizeKeyEventsSequence(NSWindow* window,
- app::KeyboardCode keycode,
+ base::KeyboardCode keycode,
bool control,
bool shift,
bool alt,
@@ -131,25 +131,25 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
NSUInteger flags = 0;
if (control) {
flags |= NSControlKeyMask;
- event = SynthesizeKeyEvent(window, true, app::VKEY_CONTROL, flags);
+ event = SynthesizeKeyEvent(window, true, base::VKEY_CONTROL, flags);
DCHECK(event);
events->push_back(event);
}
if (shift) {
flags |= NSShiftKeyMask;
- event = SynthesizeKeyEvent(window, true, app::VKEY_SHIFT, flags);
+ event = SynthesizeKeyEvent(window, true, base::VKEY_SHIFT, flags);
DCHECK(event);
events->push_back(event);
}
if (alt) {
flags |= NSAlternateKeyMask;
- event = SynthesizeKeyEvent(window, true, app::VKEY_MENU, flags);
+ event = SynthesizeKeyEvent(window, true, base::VKEY_MENU, flags);
DCHECK(event);
events->push_back(event);
}
if (command) {
flags |= NSCommandKeyMask;
- event = SynthesizeKeyEvent(window, true, app::VKEY_COMMAND, flags);
+ event = SynthesizeKeyEvent(window, true, base::VKEY_COMMAND, flags);
DCHECK(event);
events->push_back(event);
}
@@ -163,25 +163,25 @@ void SynthesizeKeyEventsSequence(NSWindow* window,
if (command) {
flags &= ~NSCommandKeyMask;
- event = SynthesizeKeyEvent(window, false, app::VKEY_COMMAND, flags);
+ event = SynthesizeKeyEvent(window, false, base::VKEY_COMMAND, flags);
DCHECK(event);
events->push_back(event);
}
if (alt) {
flags &= ~NSAlternateKeyMask;
- event = SynthesizeKeyEvent(window, false, app::VKEY_MENU, flags);
+ event = SynthesizeKeyEvent(window, false, base::VKEY_MENU, flags);
DCHECK(event);
events->push_back(event);
}
if (shift) {
flags &= ~NSShiftKeyMask;
- event = SynthesizeKeyEvent(window, false, app::VKEY_SHIFT, flags);
+ event = SynthesizeKeyEvent(window, false, base::VKEY_SHIFT, flags);
DCHECK(event);
events->push_back(event);
}
if (control) {
flags &= ~NSControlKeyMask;
- event = SynthesizeKeyEvent(window, false, app::VKEY_CONTROL, flags);
+ event = SynthesizeKeyEvent(window, false, base::VKEY_CONTROL, flags);
DCHECK(event);
events->push_back(event);
}
@@ -221,7 +221,7 @@ NSPoint g_mouse_location = { 0, 0 };
namespace ui_controls {
bool SendKeyPress(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control,
bool shift,
bool alt,
@@ -234,7 +234,7 @@ bool SendKeyPress(gfx::NativeWindow window,
// Win and Linux implement a SendKeyPress() this as a
// SendKeyPressAndRelease(), so we should as well (despite the name).
bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control,
bool shift,
bool alt,
diff --git a/chrome/browser/automation/ui_controls_win.cc b/chrome/browser/automation/ui_controls_win.cc
index fdd1732..50bb88f 100644
--- a/chrome/browser/automation/ui_controls_win.cc
+++ b/chrome/browser/automation/ui_controls_win.cc
@@ -4,8 +4,7 @@
#include "chrome/browser/automation/ui_controls.h"
-#include "app/keyboard_code_conversion_win.h"
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/win_util.h"
@@ -138,10 +137,10 @@ void InputDispatcher::NotifyTask() {
// Populate the INPUT structure with the appropriate keyboard event
// parameters required by SendInput
-bool FillKeyboardInput(app::KeyboardCode key, INPUT* input, bool key_up) {
+bool FillKeyboardInput(base::KeyboardCode key, INPUT* input, bool key_up) {
memset(input, 0, sizeof(INPUT));
input->type = INPUT_KEYBOARD;
- input->ki.wVk = app::WindowsKeyCodeForKeyboardCode(key);
+ input->ki.wVk = win_util::KeyboardCodeToWin(key);
input->ki.dwFlags = key_up ? KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP :
KEYEVENTF_EXTENDEDKEY;
@@ -149,7 +148,7 @@ bool FillKeyboardInput(app::KeyboardCode key, INPUT* input, bool key_up) {
}
// Send a key event (up/down)
-bool SendKeyEvent(app::KeyboardCode key, bool up) {
+bool SendKeyEvent(base::KeyboardCode key, bool up) {
INPUT input = { 0 };
if (!FillKeyboardInput(key, &input, up))
@@ -161,7 +160,7 @@ bool SendKeyEvent(app::KeyboardCode key, bool up) {
return true;
}
-bool SendKeyPressImpl(app::KeyboardCode key,
+bool SendKeyPressImpl(base::KeyboardCode key,
bool control, bool shift, bool alt,
Task* task) {
scoped_refptr<InputDispatcher> dispatcher(
@@ -172,7 +171,7 @@ bool SendKeyPressImpl(app::KeyboardCode key,
// exists, send the key event directly there.
HWND popup_menu = ::FindWindow(L"#32768", 0);
if (popup_menu != NULL && popup_menu == ::GetTopWindow(NULL)) {
- WPARAM w_param = app::WindowsKeyCodeForKeyboardCode(key);
+ WPARAM w_param = win_util::KeyboardCodeToWin(key);
LPARAM l_param = 0;
::SendMessage(popup_menu, WM_KEYDOWN, w_param, l_param);
::SendMessage(popup_menu, WM_KEYUP, w_param, l_param);
@@ -186,19 +185,19 @@ bool SendKeyPressImpl(app::KeyboardCode key,
UINT i = 0;
if (control) {
- if (!FillKeyboardInput(app::VKEY_CONTROL, &input[i], false))
+ if (!FillKeyboardInput(base::VKEY_CONTROL, &input[i], false))
return false;
i++;
}
if (shift) {
- if (!FillKeyboardInput(app::VKEY_SHIFT, &input[i], false))
+ if (!FillKeyboardInput(base::VKEY_SHIFT, &input[i], false))
return false;
i++;
}
if (alt) {
- if (!FillKeyboardInput(app::VKEY_MENU, &input[i], false))
+ if (!FillKeyboardInput(base::VKEY_MENU, &input[i], false))
return false;
i++;
}
@@ -212,19 +211,19 @@ bool SendKeyPressImpl(app::KeyboardCode key,
i++;
if (alt) {
- if (!FillKeyboardInput(app::VKEY_MENU, &input[i], true))
+ if (!FillKeyboardInput(base::VKEY_MENU, &input[i], true))
return false;
i++;
}
if (shift) {
- if (!FillKeyboardInput(app::VKEY_SHIFT, &input[i], true))
+ if (!FillKeyboardInput(base::VKEY_SHIFT, &input[i], true))
return false;
i++;
}
if (control) {
- if (!FillKeyboardInput(app::VKEY_CONTROL, &input[i], true))
+ if (!FillKeyboardInput(base::VKEY_CONTROL, &input[i], true))
return false;
i++;
}
@@ -323,14 +322,14 @@ bool SendMouseEventsImpl(MouseButton type, int state, Task* task) {
// public functions -----------------------------------------------------------
-bool SendKeyPress(gfx::NativeWindow window, app::KeyboardCode key,
+bool SendKeyPress(gfx::NativeWindow window, base::KeyboardCode key,
bool control, bool shift, bool alt, bool command) {
DCHECK(command == false); // No command key on Windows
return SendKeyPressImpl(key, control, shift, alt, NULL);
}
bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
- app::KeyboardCode key,
+ base::KeyboardCode key,
bool control, bool shift, bool alt,
bool command,
Task* task) {
generated by cgit v1.1 at 2025-02-01 02:04:13 +0000