Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(412)

Unified Diff: chrome/browser/automation/ui_controls_mac.mm

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/automation/ui_controls_linux.cc ('k') | chrome/browser/automation/ui_controls_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/ui_controls_mac.mm
===================================================================
--- chrome/browser/automation/ui_controls_mac.mm (revision 71220)
+++ chrome/browser/automation/ui_controls_mac.mm (working copy)
@@ -8,10 +8,10 @@
#include <mach/mach_time.h>
#include <vector>
-#include "app/keyboard_code_conversion_mac.h"
#include "base/message_loop.h"
#include "chrome/browser/automation/ui_controls_internal.h"
#include "chrome/browser/browser_thread.h"
+#include "ui/base/keycodes/keyboard_code_conversion_mac.h"
// Implementation details: We use [NSApplication sendEvent:] instead
// of [NSApplication postEvent:atStart:] so that the event gets sent
@@ -76,7 +76,7 @@
// Creates and returns an autoreleased key event.
NSEvent* SynthesizeKeyEvent(NSWindow* window,
bool keyDown,
- app::KeyboardCode keycode,
+ ui::KeyboardCode keycode,
NSUInteger flags) {
unichar character;
unichar characterIgnoringModifiers;
@@ -97,8 +97,8 @@
// 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 == ui::VKEY_CONTROL || keycode == ui::VKEY_SHIFT ||
+ keycode == ui::VKEY_MENU || keycode == ui::VKEY_COMMAND)
type = NSFlagsChanged;
// For events other than mouse moved, [event locationInWindow] is
@@ -121,7 +121,7 @@
// Creates the proper sequence of autoreleased key events for a key down + up.
void SynthesizeKeyEventsSequence(NSWindow* window,
- app::KeyboardCode keycode,
+ ui::KeyboardCode keycode,
bool control,
bool shift,
bool alt,
@@ -131,25 +131,25 @@
NSUInteger flags = 0;
if (control) {
flags |= NSControlKeyMask;
- event = SynthesizeKeyEvent(window, true, app::VKEY_CONTROL, flags);
+ event = SynthesizeKeyEvent(window, true, ui::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, ui::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, ui::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, ui::VKEY_COMMAND, flags);
DCHECK(event);
events->push_back(event);
}
@@ -163,25 +163,25 @@
if (command) {
flags &= ~NSCommandKeyMask;
- event = SynthesizeKeyEvent(window, false, app::VKEY_COMMAND, flags);
+ event = SynthesizeKeyEvent(window, false, ui::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, ui::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, ui::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, ui::VKEY_CONTROL, flags);
DCHECK(event);
events->push_back(event);
}
@@ -221,7 +221,7 @@
namespace ui_controls {
bool SendKeyPress(gfx::NativeWindow window,
- app::KeyboardCode key,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,
@@ -234,7 +234,7 @@
// 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,
+ ui::KeyboardCode key,
bool control,
bool shift,
bool alt,
« no previous file with comments | « chrome/browser/automation/ui_controls_linux.cc ('k') | chrome/browser/automation/ui_controls_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698