Relocate display_manager from ash to ui

ash/display/mirror_window_controller.cc

Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 8963c4ad1d88d50c76d5297a31a66bbddf21b7da..8ab03b4ea595d03350ae02f255be8530e5863ba0 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -15,7 +15,6 @@
 #endif
 
 #include "ash/display/cursor_window_controller.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/display/window_tree_host_manager.h"
@@ -34,6 +33,7 @@
 #include "ui/base/layout.h"
 #include "ui/compositor/reflector.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
@@ -113,12 +113,14 @@ class NoneCaptureClient : public aura::client::CaptureClient {
   DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient);
 };
 
-DisplayManager::MultiDisplayMode GetCurrentMultiDisplayMode() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+display::DisplayManager::MultiDisplayMode GetCurrentMultiDisplayMode() {
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->IsInUnifiedMode()
-             ? DisplayManager::UNIFIED
-             : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING
-                                                  : DisplayManager::EXTENDED);
+             ? display::DisplayManager::UNIFIED
+             : (display_manager->IsInMirrorMode()
+                    ? display::DisplayManager::MIRRORING
+                    : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace
@@ -135,7 +137,7 @@ MirrorWindowController::MirroringHostInfo::MirroringHostInfo() {}
 MirrorWindowController::MirroringHostInfo::~MirroringHostInfo() {}
 
 MirrorWindowController::MirrorWindowController()
-    : multi_display_mode_(DisplayManager::EXTENDED),
+    : multi_display_mode_(display::DisplayManager::EXTENDED),
       screen_position_client_(new MirroringScreenPositionClient(this)) {}
 
 MirrorWindowController::~MirrorWindowController() {
@@ -146,7 +148,8 @@ MirrorWindowController::~MirrorWindowController() {
 void MirrorWindowController::UpdateWindow(
     const std::vector<display::ManagedDisplayInfo>& display_info_list) {
   static int mirror_host_count = 0;
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   const display::Display& primary =
       display::Screen::GetScreen()->GetPrimaryDisplay();
   const display::ManagedDisplayInfo& source_display_info =
@@ -258,7 +261,8 @@ void MirrorWindowController::UpdateWindow(
 void MirrorWindowController::UpdateWindow() {
   if (mirroring_host_info_map_.empty())
     return;
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   std::vector<display::ManagedDisplayInfo> display_info_list;
   for (auto& pair : mirroring_host_info_map_)
     display_info_list.push_back(display_manager->GetDisplayInfo(pair.first));
@@ -266,7 +270,8 @@ void MirrorWindowController::UpdateWindow() {
 }
 
 void MirrorWindowController::CloseIfNotNecessary() {
-  DisplayManager::MultiDisplayMode new_mode = GetCurrentMultiDisplayMode();
+  display::DisplayManager::MultiDisplayMode new_mode =
+      GetCurrentMultiDisplayMode();
   if (multi_display_mode_ != new_mode)
     Close(true);
   multi_display_mode_ = new_mode;
@@ -304,7 +309,8 @@ void MirrorWindowController::OnHostResized(const aura::WindowTreeHost* host) {
 }
 
 aura::Window* MirrorWindowController::GetWindow() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   if (!display_manager->IsInMirrorMode() || mirroring_host_info_map_.empty())
     return nullptr;
   DCHECK_EQ(1U, mirroring_host_info_map_.size());