Relocate display_manager from ash to ui

ash/display/screen_ash.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 "ash/display/screen_ash.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/wm/root_window_finder.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/display/display_finder.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 // We need to keep this in order for unittests to tell if
 // the object in display::Screen::GetScreenByType is for shutdown.
 display::Screen* screen_for_shutdown = nullptr;
 
-DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
 class ScreenForShutdown : public display::Screen {
  public:
   explicit ScreenForShutdown(display::Screen* screen_ash)
       : display_list_(screen_ash->GetAllDisplays()),
         primary_display_(screen_ash->GetPrimaryDisplay()) {}
 
   // display::Screen overrides:
@@ skipping 79 matching lines @@
   const aura::Window* root_window = window->GetRootWindow();
   if (!root_window)
     return GetPrimaryDisplay();
   const RootWindowSettings* rws = GetRootWindowSettings(root_window);
   int64_t id = rws->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != display::Display::kInvalidDisplayID);
   if (id == display::Display::kInvalidDisplayID)
     return GetPrimaryDisplay();
 
-  DisplayManager* display_manager = GetDisplayManager();
+  display::DisplayManager* display_manager = GetDisplayManager();
   // RootWindow needs Display to determine its device scale factor
   // for non desktop display.
   display::Display mirroring_display =
       display_manager->GetMirroringDisplayById(id);
   if (mirroring_display.is_valid())
     return mirroring_display;
   return display_manager->GetDisplayForId(id);
 }
 
 display::Display ScreenAsh::GetDisplayNearestPoint(
@@ skipping 27 matching lines @@
 
 void ScreenAsh::AddObserver(display::DisplayObserver* observer) {
   GetDisplayManager()->AddObserver(observer);
 }
 
 void ScreenAsh::RemoveObserver(display::DisplayObserver* observer) {
   GetDisplayManager()->RemoveObserver(observer);
 }
 
 // static
-DisplayManager* ScreenAsh::CreateDisplayManager() {
+display::DisplayManager* ScreenAsh::CreateDisplayManager() {
   std::unique_ptr<ScreenAsh> screen(new ScreenAsh);
 
   display::Screen* current = display::Screen::GetScreen();
   // If there is no native, or the native was for shutdown,
   // use ash's screen.
   if (!current || current == screen_for_shutdown)
     display::Screen::SetScreenInstance(screen.get());
-  return new DisplayManager(std::move(screen));
+  return new display::DisplayManager(std::move(screen));
 }
 
 // static
 void ScreenAsh::CreateScreenForShutdown() {
   delete screen_for_shutdown;
   screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen());
   display::Screen::SetScreenInstance(screen_for_shutdown);
 }
 
 }  // namespace ash