| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "shell/application_manager/shell_impl.h" | 5 #include "shell/application_manager/shell_impl.h" |
| 6 | 6 |
| 7 #include "mojo/common/common_type_converters.h" | 7 #include "mojo/common/common_type_converters.h" |
| 8 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" | 8 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" |
| 9 #include "shell/application_manager/application_manager.h" | 9 #include "shell/application_manager/application_manager.h" |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 binding_(this) { | 21 binding_(this) { |
| 22 binding_.set_error_handler(this); | 22 binding_.set_error_handler(this); |
| 23 } | 23 } |
| 24 | 24 |
| 25 ShellImpl::~ShellImpl() { | 25 ShellImpl::~ShellImpl() { |
| 26 } | 26 } |
| 27 | 27 |
| 28 void ShellImpl::InitializeApplication(Array<String> args) { | 28 void ShellImpl::InitializeApplication(Array<String> args) { |
| 29 ShellPtr shell; | 29 ShellPtr shell; |
| 30 binding_.Bind(GetProxy(&shell)); | 30 binding_.Bind(GetProxy(&shell)); |
| 31 application_->Initialize(shell.Pass(), args.Pass()); | 31 application_->Initialize(shell.Pass(), url_.spec(), args.Pass()); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void ShellImpl::ConnectToClient(const GURL& requestor_url, | 34 void ShellImpl::ConnectToClient(const GURL& requestor_url, |
| 35 InterfaceRequest<ServiceProvider> services, | 35 InterfaceRequest<ServiceProvider> services, |
| 36 ServiceProviderPtr exposed_services) { | 36 ServiceProviderPtr exposed_services) { |
| 37 application_->AcceptConnection(String::From(requestor_url), services.Pass(), | 37 application_->AcceptConnection(String::From(requestor_url), services.Pass(), |
| 38 exposed_services.Pass()); | 38 exposed_services.Pass()); |
| 39 } | 39 } |
| 40 | 40 |
| 41 // Shell implementation: | 41 // Shell implementation: |
| 42 void ShellImpl::ConnectToApplication(const String& app_url, | 42 void ShellImpl::ConnectToApplication(const String& app_url, |
| 43 InterfaceRequest<ServiceProvider> services, | 43 InterfaceRequest<ServiceProvider> services, |
| 44 ServiceProviderPtr exposed_services) { | 44 ServiceProviderPtr exposed_services) { |
| 45 GURL app_gurl(app_url); | 45 GURL app_gurl(app_url); |
| 46 if (!app_gurl.is_valid()) { | 46 if (!app_gurl.is_valid()) { |
| 47 LOG(ERROR) << "Error: invalid URL: " << app_url; | 47 LOG(ERROR) << "Error: invalid URL: " << app_url; |
| 48 return; | 48 return; |
| 49 } | 49 } |
| 50 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), | 50 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), |
| 51 exposed_services.Pass()); | 51 exposed_services.Pass()); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void ShellImpl::OnConnectionError() { | 54 void ShellImpl::OnConnectionError() { |
| 55 manager_->OnShellImplError(this); | 55 manager_->OnShellImplError(this); |
| 56 } | 56 } |
| 57 | 57 |
| 58 } // namespace mojo | 58 } // namespace mojo |
| OLD | NEW |