Relocate display_manager from ash to ui

ash/screen_util.cc

Index: ash/screen_util.cc
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index ae79413a0e6fa97f818d8c78aa20d66153d6920d..c1a9a3c3b122539cc3a4ad57163e5a3f311d9f59 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -5,20 +5,20 @@
 #include "ash/screen_util.h"
 
 #include "ash/aura/wm_shelf_aura.h"
-#include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace ash {
 
 namespace {
-DisplayManager* GetDisplayManager() {
+display::DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 }