Change signature of OnConnect

ash/mus/window_manager_application.cc

 // Copyright 2015 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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
@@ skipping 93 matching lines @@
 
   tracing_.Initialize(connector(), identity.name());
 
   ui::WindowTreeClient* window_tree_client = new ui::WindowTreeClient(
       window_manager_.get(), window_manager_.get(), nullptr);
   window_tree_client->ConnectAsWindowManager(connector());
 
   InitWindowManager(window_tree_client);
 }
 
-bool WindowManagerApplication::OnConnect(shell::Connection* connection) {
-  connection->AddInterface<mojom::ShelfLayout>(this);
-  connection->AddInterface<mojom::UserWindowController>(this);
-  connection->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
-  if (connection->GetRemoteIdentity().name() == "mojo:mash_session") {
-    connector()->ConnectToInterface(connection->GetRemoteIdentity(), &session_);
+bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
+                                         shell::InterfaceRegistry* registry) {
+  registry->AddInterface<mojom::ShelfLayout>(this);
+  registry->AddInterface<mojom::UserWindowController>(this);
+  registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
+  if (remote_identity.name() == "mojo:mash_session") {
+    connector()->ConnectToInterface(remote_identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
   }
   return true;
 }
 
 void WindowManagerApplication::Create(
     const shell::Identity& remote_identity,
     mojo::InterfaceRequest<mojom::ShelfLayout> request) {
   // TODO(msw): Handle multiple shelves (one per display).
@@ skipping 68 matching lines @@
     RootWindowController* controller) {
   // TODO(msw): this isn't right, ownership should belong in WindowManager
   // and/or RootWindowController. But this is temporary until we get rid of
   // sysui.
   shelf_layout_.reset();
   user_window_controller_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash