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