Revert 229521 "Revert 229507 "aura: Allow creating content_shell..."

Revert didn't help, so reland the change.

> Revert 229507 "aura: Allow creating content_shell without views."
> 
> Speculative. All windows bots on the main waterfall except for the clobber
> builder started timing out during compile during a window that had only this
> change and two test-only changes in the range.
> 
> > aura: Allow creating content_shell without views.
> > 
> > This builds content_shell with use_aura=1 and toolkit_views=0.
> > 
> > BUG=none
> > R=derat@chromium.org, jamescook@chromium.org, jochen@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/26695007
> 
> TBR=sadrul@chromium.org
> 
> Review URL: https://codereview.chromium.org/30413002

TBR=thakis@chromium.org

Review URL: https://codereview.chromium.org/27993005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229524 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/ui/ui.gyp b/ui/ui.gyp
index 29c3e52..a5a0172 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/': [