Relocate display_manager from ash to ui

ash/display/display_configuration_controller.cc

 // Copyright 2016 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/display_configuration_controller.h"
 
 #include "ash/display/display_animator.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "base/time/time.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/manager/display_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/display_animator_chromeos.h"
 #include "base/sys_info.h"
 #include "grit/ash_strings.h"
 #endif
 
 namespace {
 
 // Specifies how long the display change should have been disabled
@@ skipping 21 matching lines @@
 
   bool IsThrottled() const { return base::Time::Now() < throttle_timeout_; }
 
  private:
   base::Time throttle_timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
 };
 
 DisplayConfigurationController::DisplayConfigurationController(
-    DisplayManager* display_manager,
+    display::DisplayManager* display_manager,
     WindowTreeHostManager* window_tree_host_manager)
     : display_manager_(display_manager),
       window_tree_host_manager_(window_tree_host_manager),
       weak_ptr_factory_(this) {
   window_tree_host_manager_->AddObserver(this);
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS())
     limiter_.reset(new DisplayChangeLimiter);
   display_animator_.reset(new DisplayAnimatorChromeOS());
 #endif
@@ skipping 104 matching lines @@
 }
 
 void DisplayConfigurationController::SetPrimaryDisplayIdImpl(
     int64_t display_id) {
   window_tree_host_manager_->SetPrimaryDisplayId(display_id);
   if (display_animator_)
     display_animator_->StartFadeInAnimation();
 }
 
 }  // namespace ash