| 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 "mash/wm/root_window_controller.h" | 5 #include "mash/wm/root_window_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "components/mus/common/util.h" | 10 #include "components/mus/common/util.h" |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 134 |
| 135 mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS); | 135 mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS); |
| 136 window_layout_.reset( | 136 window_layout_.reset( |
| 137 new WindowLayout(GetWindowForContainer(mojom::Container::USER_WINDOWS))); | 137 new WindowLayout(GetWindowForContainer(mojom::Container::USER_WINDOWS))); |
| 138 window_manager_client()->AddActivationParent(window); | 138 window_manager_client()->AddActivationParent(window); |
| 139 window_tree_host_->SetTitle("Mash"); | 139 window_tree_host_->SetTitle("Mash"); |
| 140 | 140 |
| 141 AddAccelerators(); | 141 AddAccelerators(); |
| 142 | 142 |
| 143 mash::shell::mojom::ShellPtr shell; | 143 mash::shell::mojom::ShellPtr shell; |
| 144 app_->shell()->ConnectToService("mojo:mash_shell", &shell); | 144 app_->shell()->ConnectToInterface("mojo:mash_shell", &shell); |
| 145 window_manager_->Initialize(this, std::move(shell)); | 145 window_manager_->Initialize(this, std::move(shell)); |
| 146 | 146 |
| 147 shadow_controller_.reset(new ShadowController(root->connection())); | 147 shadow_controller_.reset(new ShadowController(root->connection())); |
| 148 | 148 |
| 149 app_->OnRootWindowControllerDoneInit(this); | 149 app_->OnRootWindowControllerDoneInit(this); |
| 150 } | 150 } |
| 151 | 151 |
| 152 void RootWindowController::OnConnectionLost( | 152 void RootWindowController::OnConnectionLost( |
| 153 mus::WindowTreeConnection* connection) { | 153 mus::WindowTreeConnection* connection) { |
| 154 shadow_controller_.reset(); | 154 shadow_controller_.reset(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 mojom::Container::LOGIN_WINDOWS); | 204 mojom::Container::LOGIN_WINDOWS); |
| 205 CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, | 205 CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, |
| 206 mojom::Container::ROOT); | 206 mojom::Container::ROOT); |
| 207 CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); | 207 CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); |
| 208 CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); | 208 CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); |
| 209 CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); | 209 CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); |
| 210 } | 210 } |
| 211 | 211 |
| 212 } // namespace wm | 212 } // namespace wm |
| 213 } // namespace mash | 213 } // namespace mash |
| OLD | NEW |