| Index: shell/application_manager/shell_impl.cc
|
| diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
|
| index 289b19b85e7573dd44d9b6c86ff9340162f33fc0..e8efb27373f9c44ae856d016d7344f52c0a07a35 100644
|
| --- a/shell/application_manager/shell_impl.cc
|
| +++ b/shell/application_manager/shell_impl.cc
|
| @@ -14,10 +14,10 @@ namespace shell {
|
| ShellImpl::ShellImpl(ApplicationPtr application,
|
| ApplicationManager* manager,
|
| const GURL& requested_url,
|
| - const GURL& url)
|
| + const URLAndIdentity& url_and_identity)
|
| : manager_(manager),
|
| requested_url_(requested_url),
|
| - url_(url),
|
| + url_and_identity_(url_and_identity),
|
| application_(application.Pass()),
|
| binding_(this) {
|
| binding_.set_error_handler(this);
|
| @@ -29,7 +29,8 @@ ShellImpl::~ShellImpl() {
|
| void ShellImpl::InitializeApplication(Array<String> args) {
|
| ShellPtr shell;
|
| binding_.Bind(GetProxy(&shell));
|
| - application_->Initialize(shell.Pass(), args.Pass(), url_.spec());
|
| + application_->Initialize(shell.Pass(), args.Pass(),
|
| + url_and_identity_.url.spec());
|
| }
|
|
|
| void ShellImpl::ConnectToClient(const GURL& requested_url,
|
| @@ -49,8 +50,8 @@ void ShellImpl::ConnectToApplication(const String& app_url,
|
| LOG(ERROR) << "Error: invalid URL: " << app_url;
|
| return;
|
| }
|
| - manager_->ConnectToApplication(app_gurl, url_, services.Pass(),
|
| - exposed_services.Pass());
|
| + manager_->ConnectToApplication(app_gurl, url_and_identity_.url,
|
| + services.Pass(), exposed_services.Pass());
|
| }
|
|
|
| void ShellImpl::OnConnectionError() {
|
|
|