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

Unified Diff: ui/events/events.gyp

Issue 251493002: MacViews: Implement basic NSEvent -> ui::Event conversion for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: selfnit Created 6 years, 8 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
Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 00f5186c113e982ef979faed938d2b54bd78c02d..6ba3859c7a0a5a4be4906ca9f3125325b8fa2132 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -85,6 +85,7 @@
'sources': [
'cocoa/cocoa_event_utils.h',
'cocoa/cocoa_event_utils.mm',
+ 'cocoa/events_mac.mm',
'event.cc',
'event.h',
'event_dispatcher.cc',
@@ -166,7 +167,7 @@
'conditions': [
# We explicitly enumerate the platforms we _do_ provide native cracking
# for here.
- ['OS=="win" or use_x11==1 or use_ozone==1', {
+ ['OS=="win" or OS=="mac" or use_x11==1 or use_ozone==1', {
'sources!': [
'events_stub.cc',
],
@@ -330,6 +331,7 @@
'<(DEPTH)/testing/gtest.gyp:gtest',
'../gfx/gfx.gyp:gfx',
'../gfx/gfx.gyp:gfx_geometry',
+ '../gfx/gfx.gyp:gfx_test_support',
sadrul 2014/04/24 19:47:12 I think this is already in from tfarina@s change.
tapted 2014/04/25 03:44:55 So it is!
'dom4_keycode_converter',
'events',
'events_base',
@@ -337,7 +339,7 @@
'gesture_detection'
],
'sources': [
- 'cocoa/cocoa_event_utils_unittest.mm',
+ 'cocoa/events_mac_unittest.mm',
'event_dispatcher_unittest.cc',
'event_processor_unittest.cc',
'event_rewriter_unittest.cc',

Powered by Google App Engine
This is Rietveld 408576698