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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 } | 108 } |
109 | 109 |
110 void WindowServer::SetGpuHost(std::unique_ptr<GpuHost> gpu_host) { | 110 void WindowServer::SetGpuHost(std::unique_ptr<GpuHost> gpu_host) { |
111 gpu_host_ = std::move(gpu_host); | 111 gpu_host_ = std::move(gpu_host); |
112 } | 112 } |
113 | 113 |
114 scoped_refptr<base::SingleThreadTaskRunner>& WindowServer::GetResourceRunner() { | 114 scoped_refptr<base::SingleThreadTaskRunner>& WindowServer::GetResourceRunner() { |
115 return delegate()->GetResourceRunner(); | 115 return delegate()->GetResourceRunner(); |
116 } | 116 } |
117 | 117 |
118 base::WeakPtr<ui::ImageCursors> WindowServer::GetImageCursorsWeakPtr() { | 118 base::WeakPtr<ui::ImageCursorsHolder> |
119 return delegate()->GetImageCursorsWeakPtr(); | 119 WindowServer::GetImageCursorsHolderWeakPtr() { |
| 120 return delegate()->GetImageCursorsHolderWeakPtr(); |
120 } | 121 } |
121 | 122 |
122 ServerWindow* WindowServer::CreateServerWindow( | 123 ServerWindow* WindowServer::CreateServerWindow( |
123 const WindowId& id, | 124 const WindowId& id, |
124 const std::map<std::string, std::vector<uint8_t>>& properties) { | 125 const std::map<std::string, std::vector<uint8_t>>& properties) { |
125 ServerWindow* window = new ServerWindow(this, id, properties); | 126 ServerWindow* window = new ServerWindow(this, id, properties); |
126 window->AddObserver(this); | 127 window->AddObserver(this); |
127 return window; | 128 return window; |
128 } | 129 } |
129 | 130 |
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
919 void WindowServer::OnUserIdAdded(const UserId& id) { | 920 void WindowServer::OnUserIdAdded(const UserId& id) { |
920 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); | 921 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); |
921 } | 922 } |
922 | 923 |
923 void WindowServer::OnUserIdRemoved(const UserId& id) { | 924 void WindowServer::OnUserIdRemoved(const UserId& id) { |
924 activity_monitor_map_.erase(id); | 925 activity_monitor_map_.erase(id); |
925 } | 926 } |
926 | 927 |
927 } // namespace ws | 928 } // namespace ws |
928 } // namespace ui | 929 } // namespace ui |
OLD | NEW |