Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Side by Side Diff: services/ui/ws/window_manager_state.cc

Issue 2710023007: Make WindowTree::SetModal() take the type. (Closed)
Patch Set: Fix compile error. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "services/service_manager/public/interfaces/connector.mojom.h" 10 #include "services/service_manager/public/interfaces/connector.mojom.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void WindowManagerState::CancelDragDrop() { 201 void WindowManagerState::CancelDragDrop() {
202 event_dispatcher_.CancelDragDrop(); 202 event_dispatcher_.CancelDragDrop();
203 } 203 }
204 204
205 void WindowManagerState::EndDragDrop() { 205 void WindowManagerState::EndDragDrop() {
206 event_dispatcher_.EndDragDrop(); 206 event_dispatcher_.EndDragDrop();
207 UpdateNativeCursorFromDispatcher(); 207 UpdateNativeCursorFromDispatcher();
208 } 208 }
209 209
210 void WindowManagerState::AddSystemModalWindow(ServerWindow* window) { 210 void WindowManagerState::AddSystemModalWindow(ServerWindow* window) {
211 DCHECK(!window->transient_parent());
212 event_dispatcher_.AddSystemModalWindow(window); 211 event_dispatcher_.AddSystemModalWindow(window);
213 } 212 }
214 213
215 const UserId& WindowManagerState::user_id() const { 214 const UserId& WindowManagerState::user_id() const {
216 return window_tree_->user_id(); 215 return window_tree_->user_id();
217 } 216 }
218 217
219 void WindowManagerState::OnWillDestroyTree(WindowTree* tree) { 218 void WindowManagerState::OnWillDestroyTree(WindowTree* tree) {
220 event_dispatcher_.OnWillDestroyDragTargetConnection(tree); 219 event_dispatcher_.OnWillDestroyDragTargetConnection(tree);
221 220
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 window->RemoveObserver(this); 668 window->RemoveObserver(this);
670 orphaned_window_manager_display_roots_.erase(iter); 669 orphaned_window_manager_display_roots_.erase(iter);
671 return; 670 return;
672 } 671 }
673 } 672 }
674 NOTREACHED(); 673 NOTREACHED();
675 } 674 }
676 675
677 } // namespace ws 676 } // namespace ws
678 } // namespace ui 677 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698