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

Unified Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2625843002: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: 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/mus/bridge/wm_window_mus.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index 324c31ebcf6d83ca208817274ed18bfbcb6f24c0..ce54cc3b15d50e8322ac977064ccc401dbd7bd3e 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -61,10 +61,9 @@ bool WmWindowMus::IsContainer() const {
return GetShellWindowId() != kShellWindowId_Invalid;
}
-WmRootWindowController* WmWindowMus::GetRootWindowController() {
+ash::RootWindowController* WmWindowMus::GetRootWindowController() {
return RootWindowController::ForWindow(aura_window())
- ->ash_root_window_controller()
- ->wm_root_window_controller();
+ ->ash_root_window_controller();
}
WmShell* WmWindowMus::GetShell() const {

Powered by Google App Engine
This is Rietveld 408576698