Pass application ids via AcceptConnection & ConnectToApplication callback.

ui/views/mus/surface_binding.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 "ui/views/mus/surface_binding.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <utility>
@@ skipping 15 matching lines @@
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/connect.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 
 namespace views {
 namespace {
-void OnGotContentHandlerID(uint32_t content_handler_id) {}
+void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
 }  // namespace
 
 // PerConnectionState ----------------------------------------------------------
 
 // State needed per ViewManager. Provides the real implementation of
 // CreateOutputSurface. SurfaceBinding obtains a pointer to the
 // PerConnectionState appropriate for the ViewManager. PerConnectionState is
 // stored in a thread local map. When no more refereces to a PerConnectionState
 // remain the PerConnectionState is deleted and the underlying map cleaned up.
 class SurfaceBinding::PerConnectionState
@@ skipping 81 matching lines @@
   }
 }
 
 void SurfaceBinding::PerConnectionState::Init() {
   mojo::ServiceProviderPtr service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:mus");
   shell_->ConnectToApplication(std::move(request), GetProxy(&service_provider),
                                nullptr,
                                mojo::CreatePermissiveCapabilityFilter(),
-                               base::Bind(&OnGotContentHandlerID));
+                               base::Bind(&OnGotRemoteIDs));
   ConnectToService(service_provider.get(), &gpu_);
 }
 
 // SurfaceBinding --------------------------------------------------------------
 
 SurfaceBinding::SurfaceBinding(mojo::Shell* shell,
                                mus::Window* window,
                                mus::mojom::SurfaceType surface_type)
     : window_(window),
       surface_type_(surface_type),
       state_(PerConnectionState::Get(shell, window->connection())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(window_, surface_type_);
 }
 
 }  // namespace views