Relocate display_manager from ash to ui

ash/accelerators/accelerator_commands_aura.cc

Index: ash/accelerators/accelerator_commands_aura.cc
diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
index fc252343985a54e8582e125c9aec49fdcaf0525d..88ad889005751d13f3ed605495058dc0b5278131 100644
--- a/ash/accelerators/accelerator_commands_aura.cc
+++ b/ash/accelerators/accelerator_commands_aura.cc
@@ -6,10 +6,10 @@
 
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "base/metrics/user_metrics.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 
 namespace ash {
@@ -22,7 +22,8 @@ void ToggleTouchHudProjection() {
 }
 
 bool IsInternalDisplayZoomEnabled() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->IsDisplayUIScalingEnabled() ||
          display_manager->IsInUnifiedMode();
 }
@@ -33,13 +34,15 @@ bool ZoomInternalDisplay(bool up) {
   else
     base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Down"));
 
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->ZoomInternalDisplay(up);
 }
 
 void ResetInternalDisplayZoom() {
   base::RecordAction(base::UserMetricsAction("Accel_Scale_Ui_Reset"));
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   display_manager->ResetInternalDisplayZoom();
 }