Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4651)

Unified Diff: chrome/browser/signin/easy_unlock_service_regular.cc

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/signin/easy_unlock_service_regular.cc
diff --git a/chrome/browser/signin/easy_unlock_service_regular.cc b/chrome/browser/signin/easy_unlock_service_regular.cc
index 94f59f3b325d45abe6110292c63c2739945c3394..0ab6539ddbedfb9c39c7bd24e4a562e57d3b926d 100644
--- a/chrome/browser/signin/easy_unlock_service_regular.cc
+++ b/chrome/browser/signin/easy_unlock_service_regular.cc
@@ -55,7 +55,6 @@
#if defined(OS_CHROMEOS)
#include "apps/app_lifetime_monitor_factory.h"
-#include "ash/common/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/shell.h"
#include "base/linux_util.h"
@@ -65,6 +64,7 @@
#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/managed_display_info.h"
#endif
namespace {
@@ -629,7 +629,7 @@ cryptauth::GcmDeviceInfo EasyUnlockServiceRegular::GetGcmDeviceInfo() {
ash::Shell::GetInstance()->display_manager();
int64_t primary_display_id =
display_manager->GetPrimaryDisplayCandidate().id();
- ash::DisplayInfo display_info =
+ display::ManagedDisplayInfo display_info =
display_manager->GetDisplayInfo(primary_display_id);
gfx::Rect bounds = display_info.bounds_in_native();

Powered by Google App Engine
This is Rietveld 408576698