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

Unified Diff: ash/common/wm/workspace/workspace_layout_manager.h

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: merge Created 3 years, 11 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
Index: ash/common/wm/workspace/workspace_layout_manager.h
diff --git a/ash/common/wm/workspace/workspace_layout_manager.h b/ash/common/wm/workspace/workspace_layout_manager.h
index ca3abb1a061a2239a7fa9076cbb507104f7514f6..80cefe83320236a313830ff5a7c6ed2230f282d3 100644
--- a/ash/common/wm/workspace/workspace_layout_manager.h
+++ b/ash/common/wm/workspace/workspace_layout_manager.h
@@ -21,8 +21,8 @@
#include "ui/keyboard/keyboard_controller_observer.h"
namespace ash {
+class RootWindowController;
class WmShell;
-class WmRootWindowController;
class WorkspaceLayoutManagerBackdropDelegate;
namespace wm {
@@ -116,7 +116,7 @@ class ASH_EXPORT WorkspaceLayoutManager
WmWindow* window_;
WmWindow* root_window_;
- WmRootWindowController* root_window_controller_;
+ RootWindowController* root_window_controller_;
WmShell* shell_;
// Set of windows we're listening to.
« no previous file with comments | « ash/common/wm/workspace/phantom_window_controller.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698