| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 new ws::TouchController(window_server_->display_manager())); | 197 new ws::TouchController(window_server_->display_manager())); |
| 198 | 198 |
| 199 ime_server_.Init(context()->connector(), test_config_); | 199 ime_server_.Init(context()->connector(), test_config_); |
| 200 } | 200 } |
| 201 | 201 |
| 202 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info, | 202 bool Service::OnConnect(const service_manager::ServiceInfo& remote_info, |
| 203 service_manager::InterfaceRegistry* registry) { | 203 service_manager::InterfaceRegistry* registry) { |
| 204 registry->AddInterface<mojom::AccessibilityManager>(this); | 204 registry->AddInterface<mojom::AccessibilityManager>(this); |
| 205 registry->AddInterface<mojom::Clipboard>(this); | 205 registry->AddInterface<mojom::Clipboard>(this); |
| 206 registry->AddInterface<mojom::DisplayManager>(this); | 206 registry->AddInterface<mojom::DisplayManager>(this); |
| 207 registry->AddInterface<mojom::GpuService>(this); | 207 registry->AddInterface<mojom::Gpu>(this); |
| 208 registry->AddInterface<mojom::IMERegistrar>(this); | 208 registry->AddInterface<mojom::IMERegistrar>(this); |
| 209 registry->AddInterface<mojom::IMEServer>(this); | 209 registry->AddInterface<mojom::IMEServer>(this); |
| 210 registry->AddInterface<mojom::UserAccessManager>(this); | 210 registry->AddInterface<mojom::UserAccessManager>(this); |
| 211 registry->AddInterface<mojom::UserActivityMonitor>(this); | 211 registry->AddInterface<mojom::UserActivityMonitor>(this); |
| 212 registry->AddInterface<WindowTreeHostFactory>(this); | 212 registry->AddInterface<WindowTreeHostFactory>(this); |
| 213 registry->AddInterface<mojom::WindowManagerWindowTreeFactory>(this); | 213 registry->AddInterface<mojom::WindowManagerWindowTreeFactory>(this); |
| 214 registry->AddInterface<mojom::WindowTreeFactory>(this); | 214 registry->AddInterface<mojom::WindowTreeFactory>(this); |
| 215 if (test_config_) | 215 if (test_config_) |
| 216 registry->AddInterface<WindowServerTest>(this); | 216 registry->AddInterface<WindowServerTest>(this); |
| 217 | 217 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 new mojom::DisplayManagerRequest(std::move(request))); | 290 new mojom::DisplayManagerRequest(std::move(request))); |
| 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::GpuServiceRequest request) { | 300 mojom::GpuRequest request) { |
| 301 window_server_->gpu_proxy()->Add(std::move(request)); | 301 window_server_->gpu_proxy()->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) { |
| (...skipping 52 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 |