Move chromeos/display/* to ui/display/chromeos

chromeos/chromeos.gyp

Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 09ed6cdc49364685e18c9c811a760ca52024258a..64d5d3cb1c232cce585906899e76d5006de73cbd 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -26,7 +26,6 @@
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/libxml/libxml.gyp:libxml',
-        '../ui/display/display.gyp:display',
         '../url/url.gyp:url_lib',
         'cryptohome_proto',
         'ime/input_method.gyp:gencode',
@@ -205,18 +204,6 @@
         'dbus/volume_state.h',
         'disks/disk_mount_manager.cc',
         'disks/disk_mount_manager.h',
-        'display/native_display_delegate.h',
-        'display/native_display_delegate_x11.cc',
-        'display/native_display_delegate_x11.h',
-        'display/native_display_event_dispatcher_x11.cc',
-        'display/native_display_event_dispatcher_x11.h',
-        'display/native_display_observer.h',
-        'display/output_configurator.cc',
-        'display/output_configurator.h',
-        'display/output_util.cc',
-        'display/output_util.h',
-        'display/touchscreen_delegate_x11.cc',
-        'display/touchscreen_delegate_x11.h',
         'ime/component_extension_ime_manager.cc',
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
@@ -347,25 +334,13 @@
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
-            '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:x11',
-            '../build/linux/system.gyp:xext',
-            '../build/linux/system.gyp:xi',
-            '../build/linux/system.gyp:xrandr',
           ],
         }, {
           # use_x11 == 0
           'sources!': [
             'ime/xkeyboard.cc',
             'ime/xkeyboard.h',
-            'display/output_configurator.cc',
-            'display/output_configurator.h',
-            'display/output_util.cc',
-            'display/output_util.h',
-            'display/real_output_configurator_delegate.cc',
-            'display/real_output_configurator_delegate.h',
-            'ime/xkeyboard.cc',
-            'ime/xkeyboard.h',
           ],
         }],
       ],
@@ -488,9 +463,6 @@
         'dbus/shill_profile_client_unittest.cc',
         'dbus/shill_service_client_unittest.cc',
         'disks/disk_mount_manager_unittest.cc',
-        'display/native_display_event_dispatcher_x11_unittest.cc',
-        'display/output_configurator_unittest.cc',
-        'display/output_util_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
         'ime/composition_text_unittest.cc',