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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm_shell.h

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
« no previous file with comments | « ash/common/system/audio/tray_audio.cc ('k') | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index ba690c1462138afba315009c86cc17876d8b26af..7ab7c1cf02a294053dd6a4339e00fed11ef6cd69 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -20,6 +20,7 @@
namespace display {
class Display;
+class ManagedDisplayInfo;
}
namespace gfx {
@@ -36,7 +37,6 @@ namespace ash {
class AcceleratorController;
class AccessibilityDelegate;
class BrightnessControlDelegate;
-class DisplayInfo;
class FocusCycler;
class ImmersiveContextAsh;
class ImmersiveFullscreenController;
@@ -176,7 +176,8 @@ class ASH_EXPORT WmShell {
// Retuns the display info associated with |display_id|.
// TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
- virtual const DisplayInfo& GetDisplayInfo(int64_t display_id) const = 0;
+ virtual const display::ManagedDisplayInfo& GetDisplayInfo(
+ int64_t display_id) const = 0;
// Matches that of DisplayManager::IsActiveDisplayId().
// TODO(mash): Remove when DisplayManager has been moved. crbug.com/622480
« no previous file with comments | « ash/common/system/audio/tray_audio.cc ('k') | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698