Revert 263726 "x11: Remove X11 message-pump."

trunk/src/ui/aura/aura.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,
   },
   'targets': [
     {
@@ skipping 190 matching lines @@
         '../gfx/gfx.gyp:gfx_geometry',
         'aura',
         'aura_test_support',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'demo/demo_main.cc',
       ],
-      'conditions': [
-        ['use_x11==1', {
-          'dependencies': [
-            '../gfx/gfx.gyp:gfx_x11',
-          ],
-        }],
-      ]
     },
     {
       'target_name': 'aura_bench',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../cc/cc.gyp:cc',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../compositor/compositor.gyp:compositor_test_support',
         '../events/events.gyp:events',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         'aura',
         'aura_test_support',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'bench/bench_main.cc',
       ],
-      'conditions': [
-        ['use_x11==1', {
-          'dependencies': [
-            '../gfx/gfx.gyp:gfx_x11',
-          ],
-        }],
-      ]
     },
     {
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:test_support_base',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
@@ skipping 28 matching lines @@
         ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
           'dependencies': [
            # See http://crbug.com/162998#c4 for why this is needed.
             '../../base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
   ],
 }