Relocate display_manager from ash to ui

chrome/browser/chromeos/policy/display_rotation_default_handler.cc

 // Copyright 2015 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 "chrome/browser/chromeos/policy/display_rotation_default_handler.h"
 
 #include <stddef.h>
 
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "ui/display/manager/display_manager.h"
 
 namespace policy {
 
 DisplayRotationDefaultHandler::DisplayRotationDefaultHandler() {
   ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
   ash::WmShell::Get()->AddShellObserver(this);
   settings_observer_ = chromeos::CrosSettings::Get()->AddSettingsObserver(
       chromeos::kDisplayRotationDefault,
       base::Bind(&DisplayRotationDefaultHandler::OnCrosSettingsChanged,
                  base::Unretained(this)));
@@ skipping 27 matching lines @@
 }
 
 void DisplayRotationDefaultHandler::RotateDisplays() {
   if (!policy_enabled_ || rotation_in_progress_)
     return;
 
   // Avoid nested calls of this function due to OnDisplayConfigurationChanged
   // being called by rotations here.
   rotation_in_progress_ = true;
 
-  ash::DisplayManager* const display_manager =
+  display::DisplayManager* const display_manager =
       ash::Shell::GetInstance()->display_manager();
   const size_t num_displays = display_manager->GetNumDisplays();
   for (size_t i = 0; i < num_displays; ++i) {
     const display::Display& display = display_manager->GetDisplayAt(i);
     const int64_t id = display.id();
     if (rotated_displays_.find(id) == rotated_displays_.end()) {
       rotated_displays_.insert(id);
       if (display.rotation() != display_rotation_default_) {
         display_manager->SetDisplayRotation(
             id, display_rotation_default_,
@@ skipping 25 matching lines @@
       (new_policy_enabled &&
        new_display_rotation_default != display_rotation_default_)) {
     policy_enabled_ = new_policy_enabled;
     display_rotation_default_ = new_display_rotation_default;
     return true;
   }
   return false;
 }
 
 }  // namespace policy