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

Unified Diff: ash/display/screen_ash.h

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 years, 2 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/display/root_window_transformers_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_ash.h
diff --git a/ash/display/screen_ash.h b/ash/display/screen_ash.h
index 15337a2d988933d709b5398e1b7104c46f06e8bb..c315caf77a55ab31ecd022241bed6c470d38c99f 100644
--- a/ash/display/screen_ash.h
+++ b/ash/display/screen_ash.h
@@ -12,6 +12,7 @@
#include "ui/display/screen.h"
namespace display {
+class DisplayManager;
class DisplayObserver;
}
@@ -20,7 +21,6 @@ class Rect;
}
namespace ash {
-class DisplayManager;
// Aura implementation of display::Screen. Implemented here to avoid circular
// dependencies.
@@ -45,7 +45,7 @@ class ASH_EXPORT ScreenAsh : public display::Screen {
void RemoveObserver(display::DisplayObserver* observer) override;
// CreateDisplayManager with a ScreenAsh instance.
- static DisplayManager* CreateDisplayManager();
+ static display::DisplayManager* CreateDisplayManager();
// Create a screen instance to be used during shutdown.
static void CreateScreenForShutdown();
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698