[WIP] ui/window: Master CL.

chromeos/chromeos.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': [
     'chromeos_tools.gypi'
@@ skipping 358 matching lines @@
         'system/name_value_pairs_parser.h',
         'system/statistics_provider.cc',
         'system/statistics_provider.h',
         'tpm_token_loader.cc',
         'tpm_token_loader.h'
       ],
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
             '../build/linux/system.gyp:x11',
-            '../ui/gfx/gfx.gyp:gfx_x11',
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }, {
           # use_x11 == 0
           'sources!': [
             'ime/keyboard_controller.cc',
             'ime/ime_keyboard.h',
           ],
         }],
       ],
     },
@@ skipping 157 matching lines @@
       'conditions': [
         # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
         [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
            'dependencies': [
               '../base/allocator/allocator.gyp:allocator',
             ],
           },
         ],
         ['use_x11 == 1', {
           'dependencies': [
-            '../ui/gfx/gfx.gyp:gfx_x11',
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }]
       ],
     },
     {
       # Protobuf compiler/generator for power-manager related protocol buffers.
       'target_name': 'power_manager_proto',
       'type': 'static_library',
       'sources': [
         '../third_party/cros_system_api/dbus/power_manager/input_event.proto',
@@ skipping 31 matching lines @@
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
 
   ],
 }