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

ui/display/chromeos/display_configurator.h

 // 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.
 
 #ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/event_types.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/display/chromeos/native_display_observer.h"
-#include "ui/display/display_constants.h"
 #include "ui/display/display_export.h"
+#include "ui/display/types/chromeos/native_display_observer.h"
+#include "ui/display/types/display_constants.h"
 
 namespace gfx {
 class Point;
 class Size;
 }
 
 namespace ui {
 class DisplayMode;
 class DisplaySnapshot;
 class NativeDisplayDelegate;
@@ skipping 143 matching lines @@
     return cached_displays_;
   }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
   }
   void set_mirroring_controller(SoftwareMirroringController* controller) {
     mirroring_controller_ = controller;
   }
 
-  // Replaces |native_display_delegate_| with |delegate| and sets
-  // |configure_display_| to true.  Should be called before Init().
-  void SetNativeDisplayDelegateForTesting(
-      scoped_ptr<NativeDisplayDelegate> delegate);
-
-  void SetTouchscreenDelegateForTesting(
-      scoped_ptr<TouchscreenDelegate> delegate);
+  // Replaces |native_display_delegate_| and |touchscreen_delegate_| with the 2
+  // delegates passed in and sets |configure_display_| to true. Should be called
+  // before Init().
+  void SetDelegatesForTesting(
+      scoped_ptr<NativeDisplayDelegate> display_delegate,
+      scoped_ptr<TouchscreenDelegate> touchscreen_delegate);
 
   // Sets the initial value of |power_state_|.  Must be called before Start().
   void SetInitialDisplayPower(chromeos::DisplayPowerState power_state);
 
   // Initialization, must be called right after constructor.
   // |is_panel_fitting_enabled| indicates hardware panel fitting support.
   void Init(bool is_panel_fitting_enabled);
 
   // Does initial configuration of displays during startup.
   // If |background_color_argb| is non zero and there are multiple displays,
@@ skipping 68 matching lines @@
   bool SetColorCalibrationProfile(int64_t display_id,
                                   ui::ColorCalibrationProfile new_profile);
 
  private:
   // Mapping a display_id to a protection request bitmask.
   typedef std::map<int64_t, uint32_t> ContentProtections;
   // Mapping a client to its protection request.
   typedef std::map<ContentProtectionClientId, ContentProtections>
       ProtectionRequests;
 
+  // If |native_display_delegate_| and |touchscreen_delegate_| are not set, then
+  // set them to the passed in values.
+  void InitializeDelegates(
+      scoped_ptr<NativeDisplayDelegate> display_delegate,
+      scoped_ptr<TouchscreenDelegate> touchscreen_delegate);
+
+  // Performs platform specific delegate initialization.
+  void PlatformInitialize();
+
   // Updates |cached_displays_| to contain currently-connected displays. Calls
   // |delegate_->GetDisplays()| and then does additional work, like finding the
   // mirror mode and setting user-preferred modes. Note that the server must be
   // grabbed via |delegate_->GrabServer()| first.
   void UpdateCachedDisplays();
 
   // Helper method for UpdateCachedDisplays() that initializes the passed-in
   // displays' |mirror_mode| fields by looking for a mode in |internal_display|
   // and |external_display| having the same resolution. Returns false if a
   // shared
@@ skipping 103 matching lines @@
 
   // Display protection requests of each client.
   ProtectionRequests client_protection_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace ui
 
 #endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_