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"
-
-#if defined(USE_OZONE)
-#include "ui/display/chromeos/ozone/native_display_delegate_ozone.h"
-#include "ui/display/chromeos/ozone/touchscreen_delegate_ozone.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
+#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"
 
 namespace ui {
 
 namespace {
 
 typedef std::vector<const DisplayMode*> DisplayModeList;
 
 // The delay to perform configuration after RRNotify.  See the comment
 // in |Dispatch()|.
 const int kConfigureDelayMs = 500;
@@ skipping 129 matching lines @@
       configure_display_(base::SysInfo::IsRunningOnChromeOS()),
       display_state_(MULTIPLE_DISPLAY_STATE_INVALID),
       power_state_(chromeos::DISPLAY_POWER_ALL_ON),
       next_display_protection_client_id_(1) {}
 
 DisplayConfigurator::~DisplayConfigurator() {
   if (native_display_delegate_)
     native_display_delegate_->RemoveObserver(this);
 }
 
-void DisplayConfigurator::SetNativeDisplayDelegateForTesting(
-    scoped_ptr<NativeDisplayDelegate> delegate) {
+void DisplayConfigurator::SetDelegatesForTesting(
+    scoped_ptr<NativeDisplayDelegate> display_delegate,
+    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
   DCHECK(!native_display_delegate_);
+  DCHECK(!touchscreen_delegate_);
 
-  native_display_delegate_ = delegate.Pass();
-  native_display_delegate_->AddObserver(this);
+  InitializeDelegates(display_delegate.Pass(), touchscreen_delegate.Pass());
   configure_display_ = true;
 }
 
-void DisplayConfigurator::SetTouchscreenDelegateForTesting(
-    scoped_ptr<TouchscreenDelegate> delegate) {
-  DCHECK(!touchscreen_delegate_);
-
-  touchscreen_delegate_ = delegate.Pass();
-}
-
 void DisplayConfigurator::SetInitialDisplayPower(
     chromeos::DisplayPowerState power_state) {
   DCHECK_EQ(display_state_, MULTIPLE_DISPLAY_STATE_INVALID);
   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());
-#elif defined(USE_X11)
-    native_display_delegate_.reset(new NativeDisplayDelegateX11());
-#else
-    NOTREACHED();
-#endif
+  PlatformInitialize();
+}
+
+void DisplayConfigurator::InitializeDelegates(
+    scoped_ptr<NativeDisplayDelegate> display_delegate,
+    scoped_ptr<TouchscreenDelegate> touchscreen_delegate) {
+  if (!native_display_delegate_ && !touchscreen_delegate_) {
+    native_display_delegate_ = display_delegate.Pass();
+    touchscreen_delegate_ = touchscreen_delegate.Pass();
+
     native_display_delegate_->AddObserver(this);
   }
-
-  if (!touchscreen_delegate_) {
-#if defined(USE_OZONE)
-    touchscreen_delegate_.reset(new TouchscreenDelegateOzone());
-#elif defined(USE_X11)
-    touchscreen_delegate_.reset(new TouchscreenDelegateX11());
-#else
-    NOTREACHED();
-#endif
-  }
 }
 
 void DisplayConfigurator::ForceInitialConfigure(
     uint32_t background_color_argb) {
   if (!configure_display_)
     return;
 
   native_display_delegate_->GrabServer();
   native_display_delegate_->Initialize();
 
@@ skipping 827 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