| 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 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 namespace shell { |
| 12 | 13 |
| 13 ShellImpl::ShellImpl(ApplicationPtr application, | 14 ShellImpl::ShellImpl(ApplicationPtr application, |
| 14 ApplicationManager* manager, | 15 ApplicationManager* manager, |
| 15 const GURL& requested_url, | 16 const GURL& requested_url, |
| 16 const GURL& url) | 17 const GURL& url) |
| 17 : manager_(manager), | 18 : manager_(manager), |
| 18 requested_url_(requested_url), | 19 requested_url_(requested_url), |
| 19 url_(url), | 20 url_(url), |
| 20 application_(application.Pass()), | 21 application_(application.Pass()), |
| 21 binding_(this) { | 22 binding_(this) { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 49 return; | 50 return; |
| 50 } | 51 } |
| 51 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), | 52 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), |
| 52 exposed_services.Pass()); | 53 exposed_services.Pass()); |
| 53 } | 54 } |
| 54 | 55 |
| 55 void ShellImpl::OnConnectionError() { | 56 void ShellImpl::OnConnectionError() { |
| 56 manager_->OnShellImplError(this); | 57 manager_->OnShellImplError(this); |
| 57 } | 58 } |
| 58 | 59 |
| 60 } // namespace shell |
| 59 } // namespace mojo | 61 } // namespace mojo |
| OLD | NEW |