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

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 2c05b0cf0c297498d9c985ed57cb241629e7f4a6..17ebbfafce2fce9426dcb77aa693754835fbdb60 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -31,12 +31,15 @@ namespace views {
class PointerWatcher;
}
+namespace ui {
+class DisplayInfo;
+}
hshi 2016/08/25 00:43:42 nit: alphabetically "namespace ui" should appear a
rjkroege 2016/08/25 21:42:15 Done.
+
namespace ash {
class AcceleratorController;
class AccessibilityDelegate;
class BrightnessControlDelegate;
-class DisplayInfo;
class FocusCycler;
class ImmersiveContextAsh;
class ImmersiveFullscreenController;
@@ -172,7 +175,7 @@ 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 ui::DisplayInfo& 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