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

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_window_manager.cc

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
Index: ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
diff --git a/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
index b15ec13aedd64c2911a81db942dc40e46a5746fe..bd9eb8bab1e9014c43df24120cdb25649ebc4ed0 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
@@ -14,6 +14,7 @@
#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_root_window_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
@@ -319,8 +320,10 @@ void MaximizeModeWindowManager::EnableBackdropBehindTopWindowOnEachDisplay(
WmRootWindowController* controller = root->GetRootWindowController();
WmWindow* default_container =
root->GetChildByShellWindowId(kShellWindowId_DefaultContainer);
- controller->SetMaximizeBackdropDelegate(base::WrapUnique(
- enable ? new WorkspaceBackdropDelegate(default_container) : nullptr));
+ controller->workspace_controller()->SetMaximizeBackdropDelegate(
+ base::WrapUnique(enable
msw 2016/08/30 21:26:46 nit: enable ? base::MakeUnique<WorkspaceBackdropDe
sky 2016/08/30 22:02:56 Done.
+ ? new WorkspaceBackdropDelegate(default_container)
+ : nullptr));
}
}

Powered by Google App Engine
This is Rietveld 408576698