[WIP] ui/window: Master CL.

chrome/chrome_browser_chromeos.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_chromeos',
       'type': 'static_library',
@@ skipping 1033 matching lines @@
             '<(INTERMEDIATE_DIR)/chrome',
           ],
           'sources/': [
             ['include', '^browser/chromeos/status/memory_menu_button.cc'],
             ['include', '^browser/chromeos/status/memory_menu_button.h'],
           ],
         }],
         ['use_aura==1 and use_x11==1', {
           'dependencies': [
             '../build/linux/system.gyp:x11',
-            '../ui/gfx/gfx.gyp:gfx_x11',
+            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['enable_printing != 0', {
           'dependencies': [
             '../printing/printing.gyp:printing',
           ],
         }],
         ['use_ozone == 1', {
           'dependencies': [
             '../ui/ozone/ozone.gyp:ozone',
@@ skipping 42 matching lines @@
         'browser/chromeos/attestation/attestation_signed_data.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/chromeos/attestation',
         'proto_out_dir': 'chrome/browser/chromeos/attestation',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }