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

ui/ozone/ozone_platform.h

Index: ui/ozone/ozone_platform.h
diff --git a/ui/ozone/ozone_platform.h b/ui/ozone/ozone_platform.h
index 61cd9efb2a204d9c9de2ea5c4c726c3b610467fd..c1f2df84b18ecde278bc2192ceb8cc79c5c31d29 100644
--- a/ui/ozone/ozone_platform.h
+++ b/ui/ozone/ozone_platform.h
@@ -11,6 +11,10 @@
 #include "ui/ozone/ime/input_method_context_factory_ozone.h"
 #include "ui/ozone/ozone_export.h"
 
+#if defined(OS_CHROMEOS)

[rjkroege, 2014/04/11 21:53:09]

unnecessary? you can forward declare NativeDisplayDelegate

[dnicoara, 2014/04/14 14:43:03]

Done.

+#include "ui/display/types/chromeos/native_display_delegate.h"
+#endif
+
 namespace ui {
 
 class CursorFactoryOzone;
@@ -38,6 +42,8 @@ class OZONE_EXPORT OzonePlatform {
   // EventFactoryOzone will be set.
   static void Initialize();
 
+  static OzonePlatform* GetInstance();
+
   // Factory getters to override in subclasses. The returned objects will be
   // injected into the appropriate layer at startup. Subclasses should not
   // inject these objects themselves. Ownership is retained by OzonePlatform.
@@ -46,6 +52,10 @@ class OZONE_EXPORT OzonePlatform {
   virtual ui::InputMethodContextFactoryOzone*
       GetInputMethodContextFactoryOzone() = 0;
   virtual ui::CursorFactoryOzone* GetCursorFactoryOzone() = 0;
+#if defined(OS_CHROMEOS)
+  virtual scoped_ptr<ui::NativeDisplayDelegate>
+      CreateNativeDisplayDelegate() = 0;
+#endif
 
  private:
   static OzonePlatform* instance_;