Chromium Code Reviews| Index: mojo/application_manager/application_manager.cc |
| diff --git a/mojo/application_manager/application_manager.cc b/mojo/application_manager/application_manager.cc |
| index 75ef7a76694b24773a65b38e644d83bd901d1ce9..f4956d00585df5c2f2216a2196e6da6f294e91bf 100644 |
| --- a/mojo/application_manager/application_manager.cc |
| +++ b/mojo/application_manager/application_manager.cc |
| @@ -100,8 +100,12 @@ class ApplicationManager::ShellImpl : public InterfaceImpl<Shell> { |
| InterfaceRequest<ServiceProvider> in_service_provider) override { |
| ServiceProviderPtr out_service_provider; |
| out_service_provider.Bind(in_service_provider.PassMessagePipe()); |
| - manager_->ConnectToApplication( |
| - app_url.To<GURL>(), url_, out_service_provider.Pass()); |
| + GURL app_gurl(app_url); |
| + if (!app_gurl.is_valid() && app_gurl.possibly_invalid_spec().size() == 0) { |
|
Aaron Boodman
2014/11/20 21:53:59
This is the first code that gets called when some
azani
2014/11/20 22:10:03
Done.
|
| + LOG(ERROR) << "Error: invalid URL: " << app_url; |
|
Aaron Boodman
2014/11/20 21:53:59
return here. The InterfaceRequest will get destroy
azani
2014/11/20 22:10:03
Done.
|
| + } |
| + DCHECK(app_gurl.possibly_invalid_spec().size() > 0); |
|
Aaron Boodman
2014/11/20 21:53:59
This moves to ApplicationManager::ConnectToApplica
azani
2014/11/20 22:10:03
Done.
|
| + manager_->ConnectToApplication(app_gurl, url_, out_service_provider.Pass()); |
| } |
| const GURL& url() const { return url_; } |