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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/root_window_controller.h

Issue 2297893002: Merges RootWindowControllerCommon into WmRootWindowController (Closed)
Patch Set: includes 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
« ash/mus/bridge/wm_root_window_controller_mus.h ('K') | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | ash/mus/root_window_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.h
diff --git a/ash/mus/root_window_controller.h b/ash/mus/root_window_controller.h
index 48642f0dbb527c5da12948090f583755607ba462..5f467a8c1e3503fe506b2be418c8ef43e9f98ac3 100644
--- a/ash/mus/root_window_controller.h
+++ b/ash/mus/root_window_controller.h
@@ -20,7 +20,6 @@ class Connector;
namespace ash {
class AlwaysOnTopController;
-class RootWindowControllerCommon;
class WorkspaceLayoutManager;
namespace mus {
@@ -85,8 +84,6 @@ class RootWindowController {
display::Display display_;
- std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
-
std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
std::unique_ptr<WmShelfMus> wm_shelf_;
« ash/mus/bridge/wm_root_window_controller_mus.h ('K') | « ash/mus/bridge/wm_root_window_controller_mus.cc ('k') | ash/mus/root_window_controller.cc » ('j') | ash/mus/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698