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

trunk/src/ui/ui.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'shell_dialogs.gypi',
@@ skipping 381 matching lines @@
             ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
           ],
         }],
         ['use_glib == 1', {
           'dependencies': [
             # font_gtk.cc uses fontconfig.
             '../build/linux/system.gyp:fontconfig',
             '../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/': [
                 ['exclude', '^base/dragdrop/drag_utils.cc'],
                 ['exclude', '^base/dragdrop/drag_utils.h'],
                 ['exclude', '^base/dragdrop/os_exchange_data.cc'],
                 ['exclude', '^base/dragdrop/os_exchange_data.h'],
               ],
             }, {
               # Note: because of gyp predence rules this has to be defined as
@@ skipping 311 matching lines @@
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
               },
             }],
           ],
         },
       ],
     }],
   ],
 }