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..82b9a413fc3b582bb22fa0b25a0e6b91142f7641 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -8,12 +8,33 @@
   },
   'targets': [
     {
+      'target_name': 'display_types',
+      'type': '<(component)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        '../../ui/gfx/gfx.gyp:gfx_geometry',
+      ],
+      'defines': [
+        'DISPLAY_IMPLEMENTATION',

[spang, 2014/04/09 22:33:33]

DISPLAY_TYPES_IMPLEMENTATION

This relates to the DISPLAY_TYPES_EXPORT macro that you have to add.

[dnicoara, 2014/04/10 01:22:26]

Done.

+      ],
+      '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',
+      ],
+    },
+    {
       'target_name': 'display',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../ui/gfx/gfx.gyp:gfx',
         '../../ui/gfx/gfx.gyp:gfx_geometry',
+        'display_types',
       ],
       'defines': [
         'DISPLAY_IMPLEMENTATION',
@@ -21,14 +42,6 @@
       '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/touchscreen_delegate_ozone.cc',
         'chromeos/ozone/touchscreen_delegate_ozone.h',
         'chromeos/x11/display_mode_x11.cc',
@@ -43,7 +56,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',
@@ -72,7 +84,7 @@
         '../../base/base.gyp:base',
         '../../ui/gfx/gfx.gyp:gfx',
         '../../ui/gfx/gfx.gyp:gfx_geometry',
-        'display',
+        'display_types',
       ],
       'defines': [
         'DISPLAY_IMPLEMENTATION',