| Index: mojo/shell/public/cpp/lib/connection_impl.cc
|
| diff --git a/mojo/shell/public/cpp/lib/connection_impl.cc b/mojo/shell/public/cpp/lib/connection_impl.cc
|
| index 47f9b9f51249d38f6b189a024d47bdb5e3f72ae4..7fb65b5c803b4431290672a3e9e7ef2be1aa984d 100644
|
| --- a/mojo/shell/public/cpp/lib/connection_impl.cc
|
| +++ b/mojo/shell/public/cpp/lib/connection_impl.cc
|
| @@ -23,6 +23,7 @@ ConnectionImpl::ConnectionImpl(
|
| const std::string& connection_url,
|
| const std::string& remote_url,
|
| uint32_t remote_id,
|
| + uint32_t remote_user_id,
|
| shell::mojom::InterfaceProviderPtr remote_interfaces,
|
| shell::mojom::InterfaceProviderRequest local_interfaces,
|
| const std::set<std::string>& allowed_interfaces)
|
| @@ -30,6 +31,7 @@ ConnectionImpl::ConnectionImpl(
|
| remote_url_(remote_url),
|
| remote_id_(remote_id),
|
| remote_ids_valid_(false),
|
| + remote_user_id_(remote_user_id),
|
| local_registry_(std::move(local_interfaces), this),
|
| remote_interfaces_(std::move(remote_interfaces)),
|
| allowed_interfaces_(allowed_interfaces),
|
| @@ -62,6 +64,10 @@ const std::string& ConnectionImpl::GetRemoteApplicationURL() {
|
| return remote_url_;
|
| }
|
|
|
| +uint32_t ConnectionImpl::GetRemoteUserID() const {
|
| + return remote_user_id_;
|
| +}
|
| +
|
| void ConnectionImpl::SetRemoteInterfaceProviderConnectionErrorHandler(
|
| const Closure& handler) {
|
| remote_interfaces_.set_connection_error_handler(handler);
|
|
|