[WIP] ui/window: Master CL.

ui/events/events.gyp

 # Copyright 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 45 matching lines @@
         'x/device_data_manager.h',
         'x/device_list_cache_x.cc',
         'x/device_list_cache_x.h',
         'x/touch_factory_x11.cc',
         'x/touch_factory_x11.h',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
-            '../gfx/gfx.gyp:gfx_x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
       ],
     },
     {
       'target_name': 'events',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
@@ skipping 101 matching lines @@
             'linux/text_edit_key_bindings_delegate_auralinux.cc',
             'linux/text_edit_key_bindings_delegate_auralinux.h',
           ],
         }],
         ['use_x11==1', {
           'sources!': [
             'platform/platform_event_source_stub.cc',
           ],
           'dependencies': [
             '../../build/linux/system.gyp:x11',
-            '../gfx/gfx.gyp:gfx_x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_glib==1', {
           'dependencies': [
             '../../build/linux/system.gyp:glib',
           ],
           'sources!': [
             'platform/x11/x11_event_source_libevent.cc',
           ],
         }, {
@@ skipping 105 matching lines @@
         'test/test_event_handler.h',
         'test/test_event_processor.cc',
         'test/test_event_processor.h',
         'test/test_event_target.cc',
         'test/test_event_target.h',
       ],
       'conditions': [
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
-            '../gfx/gfx.gyp:gfx_x11',
+            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['OS=="ios"', {
           # The cocoa files don't apply to iOS.
           'sources/': [['exclude', 'cocoa']],
         }],
       ],
     },
     {
       'target_name': 'events_unittests',
@@ skipping 67 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'events_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }