[WIP] ui/window: Master CL.

ui/gfx/gfx.gyp

Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 2c393b9904b94656a4a55b41dd00dbf154d41e50..6dd4f3431bce94cba4e77539b1dfce58aa20b196 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -378,7 +378,7 @@
         }],
         ['use_x11==1', {
           'dependencies': [
-            'gfx_x11',
+            'x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_pango==1', {
@@ -529,31 +529,5 @@
         },
       ],
     }],
-    ['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',
-          ],
-        },
-      ]
-    }],
   ],
 }