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

Unified Diff: ash/mus/window_manager.h

Issue 2314203002: Move DisplayList to display; add ScreenBase. (Closed)
Patch Set: Update unit test namespace. Created 4 years, 3 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/mus/test/wm_test_screen.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 7f4e5ac23c150fcb40a0a297b705555ddbc109a2..89b4a96b514fa020a541bf92a955072311c8efe1 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -20,7 +20,7 @@
namespace display {
class Display;
-class Screen;
+class ScreenBase;
}
namespace shell {
@@ -141,7 +141,7 @@ class WindowManager : public ui::WindowManagerDelegate,
base::ObserverList<WindowManagerObserver> observers_;
- std::unique_ptr<display::Screen> screen_;
+ std::unique_ptr<display::ScreenBase> screen_;
std::unique_ptr<WmShellMus> shell_;
« no previous file with comments | « ash/mus/test/wm_test_screen.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698