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

Unified Diff: ash/display/display_manager.h

Issue 2223063003: Move DisplayLayoutStore from ash to ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase/add TODO. 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/display/display_layout_store.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager.h
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index bffb3abde1142442a1972f0b47b39cb048b1c859..9f36edae40f1a97f71824bbeb17f4d984fa4aab9 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -34,6 +34,10 @@ namespace chromeos {
class DisplayNotificationsTest;
}
+namespace display {
+class DisplayLayoutStore;
+}
+
namespace gfx {
class Insets;
class Rect;
@@ -41,7 +45,6 @@ class Rect;
namespace ash {
class AcceleratorControllerTest;
-class DisplayLayoutStore;
class MouseWarpController;
class ScreenAsh;
@@ -102,7 +105,7 @@ class ASH_EXPORT DisplayManager
virtual ~DisplayManager();
#endif
- DisplayLayoutStore* layout_store() { return layout_store_.get(); }
+ display::DisplayLayoutStore* layout_store() { return layout_store_.get(); }
void set_delegate(Delegate* delegate) { delegate_ = delegate; }
@@ -415,7 +418,7 @@ class ASH_EXPORT DisplayManager
std::unique_ptr<ScreenAsh> screen_;
- std::unique_ptr<DisplayLayoutStore> layout_store_;
+ std::unique_ptr<display::DisplayLayoutStore> layout_store_;
int64_t first_display_id_;
« no previous file with comments | « ash/display/display_layout_store.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698