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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 | 158 |
159 app_->OnRootWindowControllerDoneInit(this); | 159 app_->OnRootWindowControllerDoneInit(this); |
160 } | 160 } |
161 | 161 |
162 void RootWindowController::OnConnectionLost( | 162 void RootWindowController::OnConnectionLost( |
163 mus::WindowTreeConnection* connection) { | 163 mus::WindowTreeConnection* connection) { |
164 shadow_controller_.reset(); | 164 shadow_controller_.reset(); |
165 delete this; | 165 delete this; |
166 } | 166 } |
167 | 167 |
168 void RootWindowController::OnEventObserved(const ui::Event& event) { | 168 void RootWindowController::OnEventObserved(const ui::Event& event, |
| 169 mus::Window* target) { |
169 // Does not use EventObservers. | 170 // Does not use EventObservers. |
170 } | 171 } |
171 | 172 |
172 void RootWindowController::OnWindowDestroyed(mus::Window* window) { | 173 void RootWindowController::OnWindowDestroyed(mus::Window* window) { |
173 DCHECK_EQ(window, root_); | 174 DCHECK_EQ(window, root_); |
174 app_->OnRootWindowDestroyed(this); | 175 app_->OnRootWindowDestroyed(this); |
175 root_->RemoveObserver(this); | 176 root_->RemoveObserver(this); |
176 // Delete the |window_manager_| here so that WindowManager doesn't have to | 177 // Delete the |window_manager_| here so that WindowManager doesn't have to |
177 // worry about the possibility of |root_| being null. | 178 // worry about the possibility of |root_| being null. |
178 window_manager_.reset(); | 179 window_manager_.reset(); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT); | 217 CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT); |
217 CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, | 218 CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, |
218 mojom::Container::ROOT); | 219 mojom::Container::ROOT); |
219 CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); | 220 CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); |
220 CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); | 221 CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); |
221 CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); | 222 CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); |
222 } | 223 } |
223 | 224 |
224 } // namespace wm | 225 } // namespace wm |
225 } // namespace mash | 226 } // namespace mash |
OLD | NEW |