Index: ash/common/root_window_controller_common.cc |
diff --git a/ash/common/root_window_controller_common.cc b/ash/common/root_window_controller_common.cc |
index 0a8008fd1742895f90e7521879ef2ec240ba80c5..d14fda37c3cc730a02e0c6ab7eb422b888dc49ea 100644 |
--- a/ash/common/root_window_controller_common.cc |
+++ b/ash/common/root_window_controller_common.cc |
@@ -6,6 +6,8 @@ |
#include "ash/common/shell_window_ids.h" |
#include "ash/common/wm/root_window_layout_manager.h" |
+#include "ash/common/wm/workspace/workspace_layout_manager.h" |
+#include "ash/common/wm/workspace_controller.h" |
#include "ash/common/wm_shell.h" |
#include "ash/common/wm_window.h" |
#include "base/memory/ptr_util.h" |
@@ -212,6 +214,14 @@ void RootWindowControllerCommon::CreateContainers() { |
void RootWindowControllerCommon::CreateLayoutManagers() { |
root_window_layout_ = new wm::RootWindowLayoutManager(root_); |
root_->SetLayoutManager(base::WrapUnique(root_window_layout_)); |
+ |
+ WmWindow* default_container = |
+ root_->GetChildByShellWindowId(kShellWindowId_DefaultContainer); |
+ workspace_controller_.reset(new WorkspaceController(default_container)); |
+} |
+ |
+void RootWindowControllerCommon::DeleteWorkspaceController() { |
+ workspace_controller_.reset(); |
} |
} // namespace ash |