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

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

Issue 2610783003: mus: Make sure window parenting happens in the window server. (Closed)
Patch Set: . Created 3 years, 11 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
« no previous file with comments | « services/ui/ws/window_server.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_server.h" 5 #include "services/ui/ws/window_server.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 502
503 WindowTree* WindowServer::GetCurrentDragLoopInitiator() { 503 WindowTree* WindowServer::GetCurrentDragLoopInitiator() {
504 if (current_drag_loop_) 504 if (current_drag_loop_)
505 return current_drag_loop_->initiator; 505 return current_drag_loop_->initiator;
506 return nullptr; 506 return nullptr;
507 } 507 }
508 508
509 void WindowServer::OnDisplayReady(Display* display, bool is_first) { 509 void WindowServer::OnDisplayReady(Display* display, bool is_first) {
510 if (is_first) 510 if (is_first)
511 delegate_->OnFirstDisplayReady(); 511 delegate_->OnFirstDisplayReady();
512 gpu_host_->OnAcceleratedWidgetAvailable(
513 display->platform_display()->GetAcceleratedWidget());
514 }
515
516 void WindowServer::OnDisplayDestroyed(Display* display) {
517 gpu_host_->OnAcceleratedWidgetDestroyed(
518 display->platform_display()->GetAcceleratedWidget());
512 } 519 }
513 520
514 void WindowServer::OnNoMoreDisplays() { 521 void WindowServer::OnNoMoreDisplays() {
515 delegate_->OnNoMoreDisplays(); 522 delegate_->OnNoMoreDisplays();
516 } 523 }
517 524
518 WindowManagerState* WindowServer::GetWindowManagerStateForUser( 525 WindowManagerState* WindowServer::GetWindowManagerStateForUser(
519 const UserId& user_id) { 526 const UserId& user_id) {
520 return window_manager_window_tree_factory_set_.GetWindowManagerStateForUser( 527 return window_manager_window_tree_factory_set_.GetWindowManagerStateForUser(
521 user_id); 528 user_id);
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 void WindowServer::OnUserIdAdded(const UserId& id) { 824 void WindowServer::OnUserIdAdded(const UserId& id) {
818 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); 825 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
819 } 826 }
820 827
821 void WindowServer::OnUserIdRemoved(const UserId& id) { 828 void WindowServer::OnUserIdRemoved(const UserId& id) {
822 activity_monitor_map_.erase(id); 829 activity_monitor_map_.erase(id);
823 } 830 }
824 831
825 } // namespace ws 832 } // namespace ws
826 } // namespace ui 833 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_server.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698