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

Unified Diff: services/ui/service.cc

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/service.h ('k') | services/ui/test_ime/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index d98909fe30ace631e1741b8b1cd888b7c65c1a0d..01a74eb60c60d50a21cb120218b243601ece511b 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -194,26 +194,27 @@ void Service::OnStart(const shell::Identity& identity) {
new ws::TouchController(window_server_->display_manager()));
}
-bool Service::OnConnect(Connection* connection) {
- connection->AddInterface<mojom::AccessibilityManager>(this);
- connection->AddInterface<mojom::Clipboard>(this);
- connection->AddInterface<mojom::DisplayManager>(this);
- connection->AddInterface<mojom::GpuService>(this);
- connection->AddInterface<mojom::UserAccessManager>(this);
- connection->AddInterface<mojom::UserActivityMonitor>(this);
- connection->AddInterface<WindowTreeHostFactory>(this);
- connection->AddInterface<mojom::WindowManagerWindowTreeFactory>(this);
- connection->AddInterface<mojom::WindowTreeFactory>(this);
+bool Service::OnConnect(const shell::Identity& remote_identity,
+ shell::InterfaceRegistry* registry) {
+ registry->AddInterface<mojom::AccessibilityManager>(this);
+ registry->AddInterface<mojom::Clipboard>(this);
+ registry->AddInterface<mojom::DisplayManager>(this);
+ registry->AddInterface<mojom::GpuService>(this);
+ registry->AddInterface<mojom::UserAccessManager>(this);
+ registry->AddInterface<mojom::UserActivityMonitor>(this);
+ registry->AddInterface<WindowTreeHostFactory>(this);
+ registry->AddInterface<mojom::WindowManagerWindowTreeFactory>(this);
+ registry->AddInterface<mojom::WindowTreeFactory>(this);
if (test_config_)
- connection->AddInterface<WindowServerTest>(this);
+ registry->AddInterface<WindowServerTest>(this);
// On non-Linux platforms there will be no DeviceDataManager instance and no
// purpose in adding the Mojo interface to connect to.
if (input_device_server_.IsRegisteredAsObserver())
- input_device_server_.AddInterface(connection);
+ input_device_server_.AddInterface(registry);
#if defined(USE_OZONE)
- ui::OzonePlatform::GetInstance()->AddInterfaces(connection);
+ ui::OzonePlatform::GetInstance()->AddInterfaces(registry);
#endif
return true;
« no previous file with comments | « services/ui/service.h ('k') | services/ui/test_ime/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698