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

Unified Diff: ui/ui_unittests.gypi

Issue 10241005: Make win_aura work without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/ui_unittests.gypi
===================================================================
--- ui/ui_unittests.gypi (revision 134107)
+++ ui/ui_unittests.gypi (working copy)
@@ -76,6 +76,7 @@
'base/test/data/resource.h',
'base/text/text_elider_unittest.cc',
'base/text/utf16_indexing_unittest.cc',
+ 'base/view_prop_unittest.cc',
'gfx/blit_unittest.cc',
'gfx/canvas_unittest.cc',
'gfx/codec/jpeg_codec_unittest.cc',
@@ -108,7 +109,6 @@
['OS == "win"', {
'sources': [
'base/dragdrop/os_exchange_data_win_unittest.cc',
- 'base/view_prop_unittest.cc',
# TODO(brettw) re-enable this when the dependencies on WindowImpl are fixed!
'gfx/icon_util_unittest.cc',
'gfx/native_theme_win_unittest.cc',
@@ -185,9 +185,13 @@
'gfx/render_text_unittest.cc',
],
}],
+ ['OS!="win"' or 'use_aura==0', {
+ 'sources!': [
+ 'base/view_prop_unittest.cc',
+ ],
+ }],
['use_aura==1', {
'sources!': [
- 'base/view_prop_unittest.cc',
'gfx/screen_unittest.cc',
],
}],

Powered by Google App Engine
This is Rietveld 408576698