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

Unified Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 879253002: MacViews: Convert Cocoa action messages into editing commands for text fields (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150127-MacViews-SendTextfieldToWindow-BORING-FILE-MOVES
Patch Set: Use VKEY_DELETE Created 5 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 | « ui/views/controls/textfield/textfield_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 7db22a33e612f345b3508658ce17f4645e9aab8a..25d5b1bf742b6b78407028221d64edd18670389d 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -10,6 +10,7 @@
#include "ui/events/event_target.h"
#include "ui/events/event_target_iterator.h"
#include "ui/events/event_targeter.h"
+#import "ui/events/test/cocoa_test_event_utils.h"
#include "ui/events/test/event_generator.h"
#include "ui/gfx/mac/coordinate_conversion.h"
@@ -249,6 +250,7 @@ class EventGeneratorDelegateMac : public ui::EventTarget,
// Overridden from ui::EventHandler (via ui::EventTarget):
void OnMouseEvent(ui::MouseEvent* event) override;
+ void OnKeyEvent(ui::KeyEvent* event) override;
// Overridden from ui::EventSource:
ui::EventProcessor* GetEventProcessor() override { return this; }
@@ -323,6 +325,17 @@ void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
EmulateSendEvent(window_, ns_event);
}
+void EventGeneratorDelegateMac::OnKeyEvent(ui::KeyEvent* event) {
+ NSUInteger modifiers = EventFlagsToModifiers(event->flags());
+ NSEvent* ns_event = cocoa_test_event_utils::SynthesizeKeyEvent(
+ window_, event->type() == ui::ET_KEY_PRESSED, event->key_code(),
+ modifiers);
+ if (owner_->targeting_application())
+ [NSApp sendEvent:ns_event];
+ else
+ EmulateSendEvent(window_, ns_event);
+}
+
void EventGeneratorDelegateMac::SetContext(ui::test::EventGenerator* owner,
gfx::NativeWindow root_window,
gfx::NativeWindow window) {
« no previous file with comments | « ui/views/controls/textfield/textfield_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698