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 <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 window_manager_->window_manager_client()->AddActivationParent( | 75 window_manager_->window_manager_client()->AddActivationParent( |
76 GetWindowByShellWindowId(kActivatableShellWindowIds[i])->mus_window()); | 76 GetWindowByShellWindowId(kActivatableShellWindowIds[i])->mus_window()); |
77 } | 77 } |
78 | 78 |
79 WmWindowMus* always_on_top_container = | 79 WmWindowMus* always_on_top_container = |
80 GetWindowByShellWindowId(kShellWindowId_AlwaysOnTopContainer); | 80 GetWindowByShellWindowId(kShellWindowId_AlwaysOnTopContainer); |
81 always_on_top_controller_.reset( | 81 always_on_top_controller_.reset( |
82 new AlwaysOnTopController(always_on_top_container)); | 82 new AlwaysOnTopController(always_on_top_container)); |
83 } | 83 } |
84 | 84 |
85 RootWindowController::~RootWindowController() {} | 85 RootWindowController::~RootWindowController() { |
| 86 root_window_controller_common_->DeleteWorkspaceController(); |
| 87 } |
86 | 88 |
87 shell::Connector* RootWindowController::GetConnector() { | 89 shell::Connector* RootWindowController::GetConnector() { |
88 return window_manager_->connector(); | 90 return window_manager_->connector(); |
89 } | 91 } |
90 | 92 |
91 ui::Window* RootWindowController::NewTopLevelWindow( | 93 ui::Window* RootWindowController::NewTopLevelWindow( |
92 std::map<std::string, std::vector<uint8_t>>* properties) { | 94 std::map<std::string, std::vector<uint8_t>>* properties) { |
93 // TODO(sky): panels need a different frame, http:://crbug.com/614362. | 95 // TODO(sky): panels need a different frame, http:://crbug.com/614362. |
94 const bool provide_non_client_frame = | 96 const bool provide_non_client_frame = |
95 GetWindowType(*properties) == ui::mojom::WindowType::WINDOW || | 97 GetWindowType(*properties) == ui::mojom::WindowType::WINDOW || |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 base::MakeUnique<DockedWindowLayoutManager>(docked_container)); | 209 base::MakeUnique<DockedWindowLayoutManager>(docked_container)); |
208 | 210 |
209 WmWindowMus* panel_container = | 211 WmWindowMus* panel_container = |
210 GetWindowByShellWindowId(kShellWindowId_PanelContainer); | 212 GetWindowByShellWindowId(kShellWindowId_PanelContainer); |
211 panel_container->SetLayoutManager( | 213 panel_container->SetLayoutManager( |
212 base::MakeUnique<PanelLayoutManager>(panel_container)); | 214 base::MakeUnique<PanelLayoutManager>(panel_container)); |
213 } | 215 } |
214 | 216 |
215 } // namespace mus | 217 } // namespace mus |
216 } // namespace ash | 218 } // namespace ash |
OLD | NEW |