| Index: mojo/public/cpp/shell/lib/application.cc
|
| diff --git a/mojo/public/cpp/shell/lib/application.cc b/mojo/public/cpp/shell/lib/application.cc
|
| index 161e4e0e582bba6d710201677739ccb1f158edde..9e93a679e998f276195a8bcbeba5beab91e9d432 100644
|
| --- a/mojo/public/cpp/shell/lib/application.cc
|
| +++ b/mojo/public/cpp/shell/lib/application.cc
|
| @@ -41,13 +41,13 @@ void Application::RemoveServiceConnector(
|
| shell_.reset();
|
| }
|
|
|
| -void Application::AcceptConnection(const mojo::String& url,
|
| +void Application::AcceptConnection(mojo::String url,
|
| ScopedMessagePipeHandle client_handle) {
|
| // TODO(davemoore): This method must be overridden by an Application subclass
|
| // to dispatch to the right ServiceConnector. We need to figure out an
|
| // approach to registration to make this better.
|
| assert(1 == service_connectors_.size());
|
| - return service_connectors_.front()->AcceptConnection(url.To<std::string>(),
|
| + return service_connectors_.front()->AcceptConnection(url,
|
| client_handle.Pass());
|
| }
|
|
|
|
|