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

Unified Diff: ui/ui.gyp

Issue 26695007: aura: Allow creating content_shell without views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 7 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 | « ui/events/events.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ui.gyp
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 29c3e528647cd3402bf6c5b750f0f9818de79610..a5a0172002c1c3797a63dc4e07cef07d32df3f92 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -399,7 +399,7 @@
'../build/linux/system.gyp:glib',
],
'conditions': [
- ['toolkit_views==0', {
+ ['toolkit_views==0 and use_aura==0', {
# Note: because of gyp predence rules this has to be defined as
# 'sources/' rather than 'sources!'.
'sources/': [
« no previous file with comments | « ui/events/events.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698