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

Unified Diff: views/views.gyp

Issue 8202014: Fixes aura build on windows. Makes all tests use the test compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years, 2 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 | « views/test/views_test_base.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 8c1ef7c8044d7f14c595d351ce728d8edfee82aa..643f2e7eaf8b40378fc193703aaf699d081f457b 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -431,7 +431,6 @@
'sources/': [
['exclude', '_(gtk|x)\\.cc$'],
['exclude', '/(gtk|x)_[^/]*\\.cc$'],
- ['exclude', 'controls/menu/menu_2.*'],
],
'sources!': [
'controls/native_control.cc',
@@ -464,6 +463,10 @@
['include', 'controls/menu/menu_separator_win.cc'],
['include', 'drag_utils_win.cc'],
],
+ }, {
+ 'sources/': [
+ ['exclude', 'controls/menu/menu_2.*'],
+ ],
}],
],
}, { # else: use_aura==1
« no previous file with comments | « views/test/views_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698