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

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

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 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') | services/ui/ws/window_server_delegate.h » ('j') | 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 void WindowServer::SetFrameSinkManager( 105 void WindowServer::SetFrameSinkManager(
106 std::unique_ptr<cc::mojom::FrameSinkManager> frame_sink_manager) { 106 std::unique_ptr<cc::mojom::FrameSinkManager> frame_sink_manager) {
107 frame_sink_manager_ = std::move(frame_sink_manager); 107 frame_sink_manager_ = std::move(frame_sink_manager);
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 ThreadedImageCursorsFactory* WindowServer::GetThreadedImageCursorsFactory() {
115 return delegate()->GetThreadedImageCursorsFactory();
116 }
117
114 ServerWindow* WindowServer::CreateServerWindow( 118 ServerWindow* WindowServer::CreateServerWindow(
115 const WindowId& id, 119 const WindowId& id,
116 const std::map<std::string, std::vector<uint8_t>>& properties) { 120 const std::map<std::string, std::vector<uint8_t>>& properties) {
117 ServerWindow* window = new ServerWindow(this, id, properties); 121 ServerWindow* window = new ServerWindow(this, id, properties);
118 window->AddObserver(this); 122 window->AddObserver(this);
119 return window; 123 return window;
120 } 124 }
121 125
122 ClientSpecificId WindowServer::GetAndAdvanceNextClientId() { 126 ClientSpecificId WindowServer::GetAndAdvanceNextClientId() {
123 const ClientSpecificId id = next_client_id_++; 127 const ClientSpecificId id = next_client_id_++;
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 void WindowServer::OnUserIdAdded(const UserId& id) { 915 void WindowServer::OnUserIdAdded(const UserId& id) {
912 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); 916 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
913 } 917 }
914 918
915 void WindowServer::OnUserIdRemoved(const UserId& id) { 919 void WindowServer::OnUserIdRemoved(const UserId& id) {
916 activity_monitor_map_.erase(id); 920 activity_monitor_map_.erase(id);
917 } 921 }
918 922
919 } // namespace ws 923 } // namespace ws
920 } // namespace ui 924 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_server.h ('k') | services/ui/ws/window_server_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698