[WIP] ui/window: Master CL.

chrome/chrome_browser.gypi

 # Copyright 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',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 3377 matching lines @@
               'dependencies': [
                 '../build/linux/system.gyp:dbus',
                 '../build/linux/system.gyp:fontconfig',
                 '../dbus/dbus.gyp:dbus',
               ],
             }],
             # x11 build
             ['use_x11==1', {
               'dependencies': [
                 '../build/linux/system.gyp:x11',
-                '../ui/gfx/gfx.gyp:gfx_x11',
+                '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         }],
         ['enable_plugin_installation==0', {
           'sources!': [
             'browser/plugins/plugin_installer.cc',
             'browser/plugins/plugin_installer.h',
             'browser/plugins/plugin_installer_observer.cc',
             'browser/plugins/plugin_installer_observer.h',
@@ skipping 311 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }