| Index: mojo/shell/public/cpp/shell_connection.h
|
| diff --git a/mojo/shell/public/cpp/shell_connection.h b/mojo/shell/public/cpp/shell_connection.h
|
| index fb132723c9923c3efd4478ff8f86dad2d80212a2..8e2f980ae756e285a0cd7c6a8233a86f00f27243 100644
|
| --- a/mojo/shell/public/cpp/shell_connection.h
|
| +++ b/mojo/shell/public/cpp/shell_connection.h
|
| @@ -59,13 +59,13 @@ class ShellConnection : public shell::mojom::ShellClient {
|
| private:
|
| // shell::mojom::ShellClient:
|
| void Initialize(shell::mojom::ConnectorPtr connector,
|
| - const mojo::String& name,
|
| - uint32_t id,
|
| - uint32_t user_id) override;
|
| + const String& name,
|
| + const String& user_id,
|
| + uint32_t id) override;
|
| void AcceptConnection(
|
| const String& requestor_name,
|
| + const String& requestor_user_id,
|
| uint32_t requestor_id,
|
| - uint32_t requestor_user_id,
|
| shell::mojom::InterfaceProviderRequest remote_interfaces,
|
| shell::mojom::InterfaceProviderPtr local_interfaces,
|
| Array<String> allowed_interfaces,
|
|
|