| 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 "services/ui/ws/window_manager_state.h" | 5 #include "services/ui/ws/window_manager_state.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 void WindowManagerState::CancelDragDrop() { | 202 void WindowManagerState::CancelDragDrop() { |
| 203 event_dispatcher_.CancelDragDrop(); | 203 event_dispatcher_.CancelDragDrop(); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void WindowManagerState::EndDragDrop() { | 206 void WindowManagerState::EndDragDrop() { |
| 207 event_dispatcher_.EndDragDrop(); | 207 event_dispatcher_.EndDragDrop(); |
| 208 UpdateNativeCursorFromDispatcher(); | 208 UpdateNativeCursorFromDispatcher(); |
| 209 } | 209 } |
| 210 | 210 |
| 211 void WindowManagerState::AddSystemModalWindow(ServerWindow* window) { | 211 void WindowManagerState::AddSystemModalWindow(ServerWindow* window) { |
| 212 DCHECK(!window->transient_parent()); | |
| 213 event_dispatcher_.AddSystemModalWindow(window); | 212 event_dispatcher_.AddSystemModalWindow(window); |
| 214 } | 213 } |
| 215 | 214 |
| 216 const UserId& WindowManagerState::user_id() const { | 215 const UserId& WindowManagerState::user_id() const { |
| 217 return window_tree_->user_id(); | 216 return window_tree_->user_id(); |
| 218 } | 217 } |
| 219 | 218 |
| 220 void WindowManagerState::OnWillDestroyTree(WindowTree* tree) { | 219 void WindowManagerState::OnWillDestroyTree(WindowTree* tree) { |
| 221 event_dispatcher_.OnWillDestroyDragTargetConnection(tree); | 220 event_dispatcher_.OnWillDestroyDragTargetConnection(tree); |
| 222 | 221 |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 window->RemoveObserver(this); | 669 window->RemoveObserver(this); |
| 671 orphaned_window_manager_display_roots_.erase(iter); | 670 orphaned_window_manager_display_roots_.erase(iter); |
| 672 return; | 671 return; |
| 673 } | 672 } |
| 674 } | 673 } |
| 675 NOTREACHED(); | 674 NOTREACHED(); |
| 676 } | 675 } |
| 677 | 676 |
| 678 } // namespace ws | 677 } // namespace ws |
| 679 } // namespace ui | 678 } // namespace ui |
| OLD | NEW |