| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/window_manager.h" | 5 #include "ash/mus/window_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 // WindowManager should never see this, instead OnWmNewDisplay() is called. | 208 // WindowManager should never see this, instead OnWmNewDisplay() is called. |
| 209 NOTREACHED(); | 209 NOTREACHED(); |
| 210 } | 210 } |
| 211 | 211 |
| 212 void WindowManager::OnDidDestroyClient(ui::WindowTreeClient* client) { | 212 void WindowManager::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 213 // Destroying the roots should result in removal from | 213 // Destroying the roots should result in removal from |
| 214 // |root_window_controllers_|. | 214 // |root_window_controllers_|. |
| 215 DCHECK(root_window_controllers_.empty()); | 215 DCHECK(root_window_controllers_.empty()); |
| 216 | 216 |
| 217 lookup_.reset(); | 217 lookup_.reset(); |
| 218 shell_->Shutdown(); |
| 218 shell_.reset(); | 219 shell_.reset(); |
| 219 shadow_controller_.reset(); | 220 shadow_controller_.reset(); |
| 220 | 221 |
| 221 FOR_EACH_OBSERVER(WindowManagerObserver, observers_, | 222 FOR_EACH_OBSERVER(WindowManagerObserver, observers_, |
| 222 OnWindowTreeClientDestroyed()); | 223 OnWindowTreeClientDestroyed()); |
| 223 | 224 |
| 224 pointer_watcher_event_router_.reset(); | 225 pointer_watcher_event_router_.reset(); |
| 225 | 226 |
| 226 window_tree_client_ = nullptr; | 227 window_tree_client_ = nullptr; |
| 227 window_manager_client_ = nullptr; | 228 window_manager_client_ = nullptr; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 const ui::Event& event) { | 306 const ui::Event& event) { |
| 306 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id)); | 307 auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id)); |
| 307 if (iter == accelerator_handlers_.end()) | 308 if (iter == accelerator_handlers_.end()) |
| 308 return ui::mojom::EventResult::HANDLED; | 309 return ui::mojom::EventResult::HANDLED; |
| 309 | 310 |
| 310 return iter->second->OnAccelerator(id, event); | 311 return iter->second->OnAccelerator(id, event); |
| 311 } | 312 } |
| 312 | 313 |
| 313 } // namespace mus | 314 } // namespace mus |
| 314 } // namespace ash | 315 } // namespace ash |
| OLD | NEW |