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

ui/ozone/ozone_platform.h

 // 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.
 
 #ifndef UI_OZONE_OZONE_PLATFORM_H_
 #define UI_OZONE_OZONE_PLATFORM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/events/ozone/event_factory_ozone.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #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;
 
 // Base class for Ozone platform implementations.
 //
 // Ozone platforms must override this class and implement the virtual
 // GetFooFactoryOzone() methods to provide implementations of the
 // various ozone interfaces.
 //
 // The OzonePlatform subclass can own any state needed by the
 // implementation that is shared between the various ozone interfaces,
 // such as a connection to the windowing system.
 //
 // A platform is free to use different implementations of each
 // interface depending on the context. You can, for example, create
 // different objects depending on the underlying hardware, command
 // line flags, or whatever is appropriate for the platform.
 class OZONE_EXPORT OzonePlatform {
  public:
   OzonePlatform();
   virtual ~OzonePlatform();
 
   // Initialize the platform. Once complete, SurfaceFactoryOzone &
   // 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.
   virtual gfx::SurfaceFactoryOzone* GetSurfaceFactoryOzone() = 0;
   virtual ui::EventFactoryOzone* GetEventFactoryOzone() = 0;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatform);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_OZONE_PLATFORM_H_