Split ui/display types into separate module and have Ozone depend on it

ui/display/display.gyp

Index: ui/display/display.gyp
diff --git a/ui/display/display.gyp b/ui/display/display.gyp
index 5ff64a9d92fd5082c28d230e0e2a8c9704e42ada..3cc5d8e2e4abfb773aed8c611ed36033fa428cf8 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -8,6 +8,27 @@
   },
   'targets': [
     {
+      'target_name': 'display_types',
+      'type': '<(component)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../ui/gfx/gfx.gyp:gfx_geometry',
+      ],
+      'defines': [
+        'DISPLAY_TYPES_IMPLEMENTATION',
+      ],
+      'sources': [
+        'types/chromeos/display_mode.cc',
+        'types/chromeos/display_mode.h',
+        'types/chromeos/display_snapshot.cc',
+        'types/chromeos/display_snapshot.h',
+        'types/chromeos/native_display_delegate.h',
+        'types/chromeos/native_display_observer',
+        'types/display_constants.h',
+        'types/display_types_export.h',
+      ],
+    },
+    {
       'target_name': 'display',
       'type': '<(component)',
       'dependencies': [
@@ -21,16 +42,10 @@
       'sources': [
         'chromeos/display_configurator.cc',
         'chromeos/display_configurator.h',
-        'chromeos/display_mode.cc',
-        'chromeos/display_mode.h',
-        'chromeos/display_snapshot.cc',
-        'chromeos/display_snapshot.h',
-        'chromeos/native_display_delegate.h',
-        'chromeos/native_display_observer.h',
-        'chromeos/ozone/native_display_delegate_ozone.cc',
-        'chromeos/ozone/native_display_delegate_ozone.h',
+        'chromeos/ozone/display_configurator_ozone.cc',
         'chromeos/ozone/touchscreen_delegate_ozone.cc',
         'chromeos/ozone/touchscreen_delegate_ozone.h',
+        'chromeos/x11/display_configurator_x11.cc',
         'chromeos/x11/display_mode_x11.cc',
         'chromeos/x11/display_mode_x11.h',
         'chromeos/x11/display_snapshot_x11.cc',
@@ -43,7 +58,6 @@
         'chromeos/x11/native_display_event_dispatcher_x11.h',
         'chromeos/x11/touchscreen_delegate_x11.cc',
         'chromeos/x11/touchscreen_delegate_x11.h',
-        'display_constants.h',
         'display_export.h',
         'display_switches.cc',
         'display_switches.h',
@@ -63,6 +77,11 @@
             '../../build/linux/system.gyp:xrandr',
           ],
         }],
+        ['chromeos == 1', {
+          'dependencies': [
+            'display_types',
+          ],
+        }],
       ],
     },
     {
@@ -72,7 +91,6 @@
         '../../base/base.gyp:base',
         '../../ui/gfx/gfx.gyp:gfx',
         '../../ui/gfx/gfx.gyp:gfx_geometry',
-        'display',
       ],
       'defines': [
         'DISPLAY_IMPLEMENTATION',
@@ -81,6 +99,13 @@
         'chromeos/test/test_display_snapshot.cc',
         'chromeos/test/test_display_snapshot.h',
       ],
+      'conditions': [
+        ['chromeos == 1', {
+          'dependencies': [
+            'display_types',
+          ],
+        }],
+      ],
     },
   ],
 }