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

Unified Diff: ash/system/chromeos/tray_display.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: ash/system/chromeos/tray_display.cc
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index 0e3001d2e47bbfd0ba72523026930c2f2b4b8182..dc5a11d3a078feb22d3e6879cfe29dad7df5e667 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -70,7 +70,7 @@ base::string16 GetDisplaySize(int64_t display_id) {
// Returns 1-line information for the specified display, like
// "InternalDisplay: 1280x750"
base::string16 GetDisplayInfoLine(int64_t display_id) {
- const DisplayInfo& display_info =
+ const display::ManagedDisplayInfo& display_info =
GetDisplayManager()->GetDisplayInfo(display_id);
if (GetDisplayManager()->mirroring_display_id() == display_id)
return GetDisplayName(display_id);
@@ -222,7 +222,7 @@ class DisplayView : public ActionableView {
// The external display name may have an annotation of "(width x height)" in
// case that the display is rotated or its resolution is changed.
base::string16 name = GetDisplayName(external_id);
- const DisplayInfo& display_info =
+ const display::ManagedDisplayInfo& display_info =
display_manager->GetDisplayInfo(external_id);
if (display_info.GetActiveRotation() != display::Display::ROTATE_0 ||
display_info.configured_ui_scale() != 1.0f ||
@@ -283,7 +283,7 @@ class DisplayView : public ActionableView {
bool ShouldShowFirstDisplayInfo() const {
const int64_t first_display_id = GetDisplayManager()->first_display_id();
- const DisplayInfo& display_info =
+ const display::ManagedDisplayInfo& display_info =
GetDisplayManager()->GetDisplayInfo(first_display_id);
return (display_info.GetActiveRotation() != display::Display::ROTATE_0 &&
(display_info.active_rotation_source() !=
« no previous file with comments | « ash/system/chromeos/tray_display.h ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698