| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/mus/root_window_controller.h" | 5 #include "ash/mus/root_window_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <sstream> | 10 #include <sstream> |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 layout_managers_[status_container->mus_window()].reset( | 228 layout_managers_[status_container->mus_window()].reset( |
| 229 new StatusLayoutManager(status_container->mus_window())); | 229 new StatusLayoutManager(status_container->mus_window())); |
| 230 | 230 |
| 231 WmWindowMus* default_container = | 231 WmWindowMus* default_container = |
| 232 GetWindowByShellWindowId(kShellWindowId_DefaultContainer); | 232 GetWindowByShellWindowId(kShellWindowId_DefaultContainer); |
| 233 // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a | 233 // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a |
| 234 // wm::LayoutManager), so it can't be in |layout_managers_|. | 234 // wm::LayoutManager), so it can't be in |layout_managers_|. |
| 235 std::unique_ptr<WorkspaceLayoutManagerDelegateImpl> | 235 std::unique_ptr<WorkspaceLayoutManagerDelegateImpl> |
| 236 workspace_layout_manager_delegate(new WorkspaceLayoutManagerDelegateImpl( | 236 workspace_layout_manager_delegate(new WorkspaceLayoutManagerDelegateImpl( |
| 237 wm_root_window_controller_.get())); | 237 wm_root_window_controller_.get())); |
| 238 workspace_layout_manager_ = new WorkspaceLayoutManager( |
| 239 default_container, std::move(workspace_layout_manager_delegate)); |
| 238 default_container->SetLayoutManager( | 240 default_container->SetLayoutManager( |
| 239 base::WrapUnique(new WorkspaceLayoutManager( | 241 base::WrapUnique(workspace_layout_manager_)); |
| 240 default_container, std::move(workspace_layout_manager_delegate)))); | |
| 241 | 242 |
| 242 WmWindowMus* docked_container = | 243 WmWindowMus* docked_container = |
| 243 GetWindowByShellWindowId(kShellWindowId_DockedContainer); | 244 GetWindowByShellWindowId(kShellWindowId_DockedContainer); |
| 244 docked_container->SetLayoutManager( | 245 docked_container->SetLayoutManager( |
| 245 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); | 246 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); |
| 246 | 247 |
| 247 WmWindowMus* panel_container = | 248 WmWindowMus* panel_container = |
| 248 GetWindowByShellWindowId(kShellWindowId_PanelContainer); | 249 GetWindowByShellWindowId(kShellWindowId_PanelContainer); |
| 249 panel_container->SetLayoutManager( | 250 panel_container->SetLayoutManager( |
| 250 base::WrapUnique(new PanelLayoutManager(panel_container))); | 251 base::WrapUnique(new PanelLayoutManager(panel_container))); |
| 251 } | 252 } |
| 252 | 253 |
| 253 } // namespace mus | 254 } // namespace mus |
| 254 } // namespace ash | 255 } // namespace ash |
| OLD | NEW |