Move ash::DisplayInfo to ui

ash/display/window_tree_host_manager.cc

Index: ash/display/window_tree_host_manager.cc
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc
index fc1ee59bb3729df7de561d06caed0dc91ba4a334..eb27638832ec6a8c48aef23a0e03b6c090ecf905 100644
--- a/ash/display/window_tree_host_manager.cc
+++ b/ash/display/window_tree_host_manager.cc
@@ -84,7 +84,8 @@ DisplayManager* GetDisplayManager() {
 
 void SetDisplayPropertiesOnHost(AshWindowTreeHost* ash_host,
                                 const display::Display& display) {
-  DisplayInfo info = GetDisplayManager()->GetDisplayInfo(display.id());
+  ui::ManagedDisplayInfo info =
+      GetDisplayManager()->GetDisplayInfo(display.id());
   aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
@@ -136,7 +137,7 @@ void SetDisplayPropertiesOnHost(AshWindowTreeHost* ash_host,
       CreateRootWindowTransformerForDisplay(host->window(), display));
   ash_host->SetRootWindowTransformer(std::move(transformer));
 
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       GetDisplayManager()->GetActiveModeForDisplayId(display.id());
   if (mode && mode->refresh_rate() > 0.0f) {
     host->compositor()->SetAuthoritativeVSyncInterval(
@@ -480,7 +481,7 @@ void WindowTreeHostManager::UpdateMouseLocationAfterDisplayChange() {
   aura::Window* dst_root_window = nullptr;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     const display::Display& display = display_manager->GetDisplayAt(i);
-    const DisplayInfo display_info =
+    const ui::ManagedDisplayInfo display_info =
         display_manager->GetDisplayInfo(display.id());
     aura::Window* root_window = GetRootWindowForDisplayId(display.id());
     if (display_info.bounds_in_native().Contains(
@@ -623,7 +624,7 @@ void WindowTreeHostManager::OnDisplayAdded(const display::Display& display) {
     GetRootWindowSettings(GetWindow(primary_tree_host_for_replace_))
         ->display_id = display.id();
     primary_tree_host_for_replace_ = nullptr;
-    const DisplayInfo& display_info =
+    const ui::ManagedDisplayInfo& display_info =
         GetDisplayManager()->GetDisplayInfo(display.id());
     AshWindowTreeHost* ash_host = window_tree_hosts_[display.id()];
     ash_host->AsWindowTreeHost()->SetBounds(display_info.bounds_in_native());
@@ -704,7 +705,7 @@ void WindowTreeHostManager::OnDisplayMetricsChanged(
   if (!(metrics & (DISPLAY_METRIC_BOUNDS | DISPLAY_METRIC_ROTATION |
                    DISPLAY_METRIC_DEVICE_SCALE_FACTOR)))
     return;
-  const DisplayInfo& display_info =
+  const ui::ManagedDisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display.id());
   DCHECK(!display_info.bounds_in_native().IsEmpty());
   AshWindowTreeHost* ash_host = window_tree_hosts_[display.id()];
@@ -810,7 +811,7 @@ AshWindowTreeHost* WindowTreeHostManager::AddWindowTreeHostForDisplay(
     const display::Display& display,
     const AshWindowTreeHostInitParams& init_params) {
   static int host_count = 0;
-  const DisplayInfo& display_info =
+  const ui::ManagedDisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display.id());
   AshWindowTreeHostInitParams params_with_bounds(init_params);
   params_with_bounds.initial_bounds = display_info.bounds_in_native();