Chromium Code Reviews| Index: mojo/shell/shell_impl.cc |
| diff --git a/mojo/shell/shell_impl.cc b/mojo/shell/shell_impl.cc |
| index 42143247b1ada794b9d78706f587f180c064d866..355c18201c2daf65ca64081a9be89c9a81a54027 100644 |
| --- a/mojo/shell/shell_impl.cc |
| +++ b/mojo/shell/shell_impl.cc |
| @@ -42,16 +42,17 @@ void ShellImpl::ConnectToClient(const GURL& requested_url, |
| } |
| // Shell implementation: |
| -void ShellImpl::ConnectToApplication(const String& app_url, |
| +void ShellImpl::ConnectToApplication(mojo::URLRequestPtr app_url, |
|
Ben Goodger (Google)
2015/05/20 21:17:05
nit: app_request
jam
2015/05/21 00:41:09
Done.
|
| InterfaceRequest<ServiceProvider> services, |
| ServiceProviderPtr exposed_services) { |
| - GURL app_gurl(app_url); |
| + GURL app_gurl(app_url->url.To<std::string>()); |
| if (!app_gurl.is_valid()) { |
| LOG(ERROR) << "Error: invalid URL: " << app_url; |
| return; |
| } |
| - manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(), |
| - exposed_services.Pass(), base::Closure()); |
| + manager_->ConnectToApplication(app_url.Pass(), identity_.url, |
| + services.Pass(), exposed_services.Pass(), |
| + base::Closure()); |
| } |
| void ShellImpl::OnConnectionError() { |