Change signature of OnConnect

services/ui/service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 176 matching lines @@
   window_server_.reset(
       new ws::WindowServer(this, platform_display_init_params_.surfaces_state));
 
   // DeviceDataManager must be initialized before TouchController. On non-Linux
   // platforms there is no DeviceDataManager so don't create touch controller.
   if (ui::DeviceDataManager::HasInstance())
     touch_controller_.reset(
         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;
 }
 
 void Service::OnFirstDisplayReady() {
   PendingRequests requests;
   requests.swap(pending_requests_);
   for (auto& request : requests) {
     if (request->wtf_request)
@@ skipping 119 matching lines @@
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 
   if (touch_controller_)
     touch_controller_->UpdateTouchTransforms();
 }
 
 }  // namespace ui