OLD | NEW |
---|---|
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 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
757 return; | 757 return; |
758 for (auto& pair : tree_map_) { | 758 for (auto& pair : tree_map_) { |
759 pair.second->ProcessTransientWindowRemoved(window, transient_child, | 759 pair.second->ProcessTransientWindowRemoved(window, transient_child, |
760 IsOperationSource(pair.first)); | 760 IsOperationSource(pair.first)); |
761 } | 761 } |
762 } | 762 } |
763 | 763 |
764 void WindowServer::OnGpuServiceInitialized() { | 764 void WindowServer::OnGpuServiceInitialized() { |
765 // TODO(kylechar): When gpu channel is removed, this can instead happen | 765 // TODO(kylechar): When gpu channel is removed, this can instead happen |
766 // earlier, after GpuHost::OnInitialized(). | 766 // earlier, after GpuHost::OnInitialized(). |
767 delegate_->StartDisplayInit(); | 767 bool window_manager_connected = false; |
rjkroege
2017/01/23 21:19:43
Are you sure that this does the right thing in INT
fwang
2017/01/24 17:11:51
Good point. As I see this commit does not change t
| |
768 for (auto* factory : window_manager_window_tree_factory_set_.GetFactories()) { | |
769 if (factory->window_tree()) { | |
770 window_manager_connected = true; | |
771 break; | |
772 } | |
773 } | |
774 delegate_->StartDisplayInit(window_manager_connected); | |
768 } | 775 } |
769 | 776 |
770 void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) { | 777 void WindowServer::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) { |
771 WindowId window_id( | 778 WindowId window_id( |
772 WindowIdFromTransportId(surface_info.id().frame_sink_id().client_id())); | 779 WindowIdFromTransportId(surface_info.id().frame_sink_id().client_id())); |
773 ServerWindow* window = GetWindow(window_id); | 780 ServerWindow* window = GetWindow(window_id); |
774 // If the window doesn't have a parent then we have nothing to propagate. | 781 // If the window doesn't have a parent then we have nothing to propagate. |
775 if (!window) | 782 if (!window) |
776 return; | 783 return; |
777 | 784 |
(...skipping 30 matching lines...) Expand all Loading... | |
808 void WindowServer::OnUserIdAdded(const UserId& id) { | 815 void WindowServer::OnUserIdAdded(const UserId& id) { |
809 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); | 816 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); |
810 } | 817 } |
811 | 818 |
812 void WindowServer::OnUserIdRemoved(const UserId& id) { | 819 void WindowServer::OnUserIdRemoved(const UserId& id) { |
813 activity_monitor_map_.erase(id); | 820 activity_monitor_map_.erase(id); |
814 } | 821 } |
815 | 822 |
816 } // namespace ws | 823 } // namespace ws |
817 } // namespace ui | 824 } // namespace ui |
OLD | NEW |