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

Unified Diff: ui/ui_unittests.gypi

Issue 13886018: Add a factory and defines for native Linux surfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get {base,ui,aura}_unittests working with native linux surface Created 7 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
« build/common.gypi ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui_unittests.gypi
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 7b8887a695c0d03e9519f7b636a03ab7dec28d13..13c7ccb39dfda3c4f4eca623987a1a4596d33c92 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -134,6 +134,7 @@
'base/gtk/gtk_im_context_util_unittest.cc',
'base/gtk/menu_label_accelerator_util_unittest.cc',
'base/keycodes/usb_keycode_map_unittest.cc',
+ 'base/linux/touch_event_from_evdev_converter_unittest.cc',
'base/models/list_model_unittest.cc',
'base/models/list_selection_model_unittest.cc',
'base/models/tree_node_model_unittest.cc',
@@ -220,6 +221,15 @@
'base/x/events_x_unittest.cc',
],
}],
+ ['use_messagepump_linux == 1', {
+ 'sources!': [
+ 'base/x/x11_util_unittest.cc',
+ ],
+ }, { # use_messagepump_linux == 0
+ 'sources!': [
+ 'base/linux/touch_event_from_evdev_converter_unittest.cc',
+ ],
+ }],
['OS != "mac" and OS != "ios"', {
'sources': [
'gfx/transform_unittest.cc',
@@ -294,6 +304,11 @@
'gfx/screen_unittest.cc',
],
}],
+ ['use_native_surface_linux==1', {
+ 'sources!': [
+ 'base/clipboard/clipboard_unittest.cc',
+ ],
+ }],
],
'target_conditions': [
['OS == "ios"', {
« build/common.gypi ('K') | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698