[WIP] ui/window: Master CL.

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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 360 matching lines @@
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'render_text.cc',
             'render_text.h',
             'text_utils_skia.cc',
           ],
         }],
         ['use_x11==1', {
           'dependencies': [
-            'gfx_x11',
+            'x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_pango==1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:pangocairo',
           ],
           'sources!': [
             'platform_font_ozone.cc',
             'render_text_ozone.cc',
           ],
@@ skipping 130 matching lines @@
           'dependencies': [
             'gfx_unittests',
           ],
           'variables': {
             'test_suite_name': 'gfx_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
-    ['use_x11 == 1', {
-      'targets': [
-        {
-          'target_name': 'gfx_x11',
-          'type': '<(component)',
-          'dependencies': [
-            '../../base/base.gyp:base',
-            '../../build/linux/system.gyp:x11',
-            'gfx_geometry',
-          ],
-          'defines': [
-            'GFX_IMPLEMENTATION',
-          ],
-          'sources': [
-            'x/x11_atom_cache.cc',
-            'x/x11_atom_cache.h',
-            'x/x11_connection.cc',
-            'x/x11_connection.h',
-            'x/x11_error_tracker.cc',
-            'x/x11_error_tracker.h',
-            'x/x11_types.cc',
-            'x/x11_types.h',
-          ],
-        },
-      ]
-    }],
   ],
 }