Relocate display_manager from ash to ui

chrome/browser/signin/easy_unlock_service_regular.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 "chrome/browser/signin/easy_unlock_service_regular.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 37 matching lines @@
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/constants.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "apps/app_lifetime_monitor_factory.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/linux_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_manager.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #endif
 
 namespace {
 
 // Key name of the local device permit record dictonary in kEasyUnlockPairing.
 const char kKeyPermitAccess[] = "permitAccess";
 
 // Key name of the remote device list in kEasyUnlockPairing.
 const char kKeyDevices[] = "devices";
@@ skipping 541 matching lines @@
   device_info.set_device_model(base::SysInfo::GetLsbReleaseBoard());
   device_info.set_device_os_version(base::GetLinuxDistro());
   // The Chrome OS version tracks the Chrome version, so fill in the same value
   // as |device_software_version_code|.
   device_info.set_device_os_version_code(software_version_code);
 
   // There may not be a Shell instance in tests.
   if (!ash::Shell::HasInstance())
     return device_info;
 
-  ash::DisplayManager* display_manager =
+  display::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
   int64_t primary_display_id =
       display_manager->GetPrimaryDisplayCandidate().id();
   display::ManagedDisplayInfo display_info =
       display_manager->GetDisplayInfo(primary_display_id);
   gfx::Rect bounds = display_info.bounds_in_native();
 
   // TODO(tengs): This is a heuristic to deterimine the DPI of the display, as
   // there is no convenient way of getting this information right now.
   const double dpi = display_info.device_scale_factor() > 1.0f ? 239.0f : 96.0f;
@@ skipping 42 matching lines @@
     PA_LOG(INFO) << "Refresh token not yet available, "
                  << "waiting before starting CryptAuth managers";
     token_service->AddObserver(this);
   }
 
   device_manager_->AddObserver(this);
   enrollment_manager_->Start();
   device_manager_->Start();
 }
 #endif