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/service.h" | 5 #include "services/ui/service.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "services/tracing/public/cpp/provider.h" | 24 #include "services/tracing/public/cpp/provider.h" |
25 #include "services/ui/clipboard/clipboard_impl.h" | 25 #include "services/ui/clipboard/clipboard_impl.h" |
26 #include "services/ui/common/switches.h" | 26 #include "services/ui/common/switches.h" |
27 #include "services/ui/display/screen_manager.h" | 27 #include "services/ui/display/screen_manager.h" |
28 #include "services/ui/ime/ime_registrar_impl.h" | 28 #include "services/ui/ime/ime_registrar_impl.h" |
29 #include "services/ui/ime/ime_server_impl.h" | 29 #include "services/ui/ime/ime_server_impl.h" |
30 #include "services/ui/ws/accessibility_manager.h" | 30 #include "services/ui/ws/accessibility_manager.h" |
31 #include "services/ui/ws/display.h" | 31 #include "services/ui/ws/display.h" |
32 #include "services/ui/ws/display_binding.h" | 32 #include "services/ui/ws/display_binding.h" |
33 #include "services/ui/ws/display_manager.h" | 33 #include "services/ui/ws/display_manager.h" |
34 #include "services/ui/ws/gpu_service_proxy.h" | 34 #include "services/ui/ws/gpu_host.h" |
35 #include "services/ui/ws/user_activity_monitor.h" | 35 #include "services/ui/ws/user_activity_monitor.h" |
36 #include "services/ui/ws/user_display_manager.h" | 36 #include "services/ui/ws/user_display_manager.h" |
37 #include "services/ui/ws/window_server.h" | 37 #include "services/ui/ws/window_server.h" |
38 #include "services/ui/ws/window_server_test_impl.h" | 38 #include "services/ui/ws/window_server_test_impl.h" |
39 #include "services/ui/ws/window_tree.h" | 39 #include "services/ui/ws/window_tree.h" |
40 #include "services/ui/ws/window_tree_binding.h" | 40 #include "services/ui/ws/window_tree_binding.h" |
41 #include "services/ui/ws/window_tree_factory.h" | 41 #include "services/ui/ws/window_tree_factory.h" |
42 #include "services/ui/ws/window_tree_host_factory.h" | 42 #include "services/ui/ws/window_tree_host_factory.h" |
43 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
44 #include "ui/base/ui_base_paths.h" | 44 #include "ui/base/ui_base_paths.h" |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 pending_requests_.push_back(std::move(pending_request)); | 291 pending_requests_.push_back(std::move(pending_request)); |
292 return; | 292 return; |
293 } | 293 } |
294 window_server_->display_manager() | 294 window_server_->display_manager() |
295 ->GetUserDisplayManager(remote_identity.user_id()) | 295 ->GetUserDisplayManager(remote_identity.user_id()) |
296 ->AddDisplayManagerBinding(std::move(request)); | 296 ->AddDisplayManagerBinding(std::move(request)); |
297 } | 297 } |
298 | 298 |
299 void Service::Create(const service_manager::Identity& remote_identity, | 299 void Service::Create(const service_manager::Identity& remote_identity, |
300 mojom::GpuRequest request) { | 300 mojom::GpuRequest request) { |
301 window_server_->gpu_proxy()->Add(std::move(request)); | 301 window_server_->gpu_host()->Add(std::move(request)); |
302 } | 302 } |
303 | 303 |
304 void Service::Create(const service_manager::Identity& remote_identity, | 304 void Service::Create(const service_manager::Identity& remote_identity, |
305 mojom::IMERegistrarRequest request) { | 305 mojom::IMERegistrarRequest request) { |
306 ime_registrar_.AddBinding(std::move(request)); | 306 ime_registrar_.AddBinding(std::move(request)); |
307 } | 307 } |
308 | 308 |
309 void Service::Create(const service_manager::Identity& remote_identity, | 309 void Service::Create(const service_manager::Identity& remote_identity, |
310 mojom::IMEServerRequest request) { | 310 mojom::IMEServerRequest request) { |
311 ime_server_.AddBinding(std::move(request)); | 311 ime_server_.AddBinding(std::move(request)); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 mojom::WindowServerTestRequest request) { | 363 mojom::WindowServerTestRequest request) { |
364 if (!test_config_) | 364 if (!test_config_) |
365 return; | 365 return; |
366 mojo::MakeStrongBinding( | 366 mojo::MakeStrongBinding( |
367 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), | 367 base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()), |
368 std::move(request)); | 368 std::move(request)); |
369 } | 369 } |
370 | 370 |
371 | 371 |
372 } // namespace ui | 372 } // namespace ui |
OLD | NEW |