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

ui/display/chromeos/display_configurator.cc

 // Copyright 2014 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.
 
 #include "ui/display/chromeos/display_configurator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
-#include "ui/display/chromeos/display_mode.h"
-#include "ui/display/chromeos/display_snapshot.h"
-#include "ui/display/chromeos/native_display_delegate.h"
 #include "ui/display/display_switches.h"
+#include "ui/display/types/chromeos/display_mode.h"
+#include "ui/display/types/chromeos/display_snapshot.h"
+#include "ui/display/types/chromeos/native_display_delegate.h"
 
 #if defined(USE_OZONE)
-#include "ui/display/chromeos/ozone/native_display_delegate_ozone.h"
 #include "ui/display/chromeos/ozone/touchscreen_delegate_ozone.h"
+#include "ui/ozone/ozone_platform.h"
 #elif defined(USE_X11)
 #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
 #include "ui/display/chromeos/x11/touchscreen_delegate_x11.h"
 #endif
 
 namespace ui {
 
 namespace {
 
 typedef std::vector<const DisplayMode*> DisplayModeList;
@@ skipping 162 matching lines @@
   power_state_ = power_state;
 }
 
 void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {
   is_panel_fitting_enabled_ = is_panel_fitting_enabled;
   if (!configure_display_)
     return;
 
   if (!native_display_delegate_) {
 #if defined(USE_OZONE)
-    native_display_delegate_.reset(new NativeDisplayDelegateOzone());
+    native_display_delegate_.reset(
+        OzonePlatform::GetInstance()->CreateNativeDisplayDelegate());
 #elif defined(USE_X11)
     native_display_delegate_.reset(new NativeDisplayDelegateX11());
 #else
     NOTREACHED();
 #endif
     native_display_delegate_->AddObserver(this);
   }
 
   if (!touchscreen_delegate_) {
 #if defined(USE_OZONE)
@@ skipping 844 matching lines @@
   float width_ratio = static_cast<float>(mirror_mode_info->size().width()) /
                       static_cast<float>(native_mode_info->size().width());
   float height_ratio = static_cast<float>(mirror_mode_info->size().height()) /
                        static_cast<float>(native_mode_info->size().height());
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
 }  // namespace ui