[WIP] ui/window: Master CL.

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': [
     {
       'target_name': 'aura',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../gpu/gpu.gyp:gpu',
         '../../skia/skia.gyp:skia',
         '../base/ui_base.gyp:ui_base',
         '../compositor/compositor.gyp:compositor',
         '../events/events.gyp:events',
         '../events/events.gyp:events_base',
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
+        '../window/window.gyp:window',
       ],
       'defines': [
         'AURA_IMPLEMENTATION',
       ],
       'sources': [
         'client/aura_constants.cc',
         'client/aura_constants.h',
         'client/capture_client.cc',
         'client/capture_client.h',
         'client/capture_delegate.h',
@@ skipping 169 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'demo/demo_main.cc',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
-            '../gfx/gfx.gyp:gfx_x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
       ]
     },
     {
       'target_name': 'aura_bench',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
@@ skipping 12 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'bench/bench_main.cc',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
-            '../gfx/gfx.gyp:gfx_x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
       ]
     },
     {
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:test_support_base',
         '../../skia/skia.gyp:skia',
@@ skipping 31 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',
           ],
         }],
       ],
     },
   ],
 }