| 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 "mojo/application_manager/shell_impl.h" | 5 #include "shell/application_manager/shell_impl.h" |
| 6 | 6 |
| 7 #include "mojo/application_manager/application_manager.h" | |
| 8 #include "mojo/common/common_type_converters.h" | 7 #include "mojo/common/common_type_converters.h" |
| 9 #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" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 | 12 |
| 13 ShellImpl::ShellImpl(ScopedMessagePipeHandle handle, | 13 ShellImpl::ShellImpl(ScopedMessagePipeHandle handle, |
| 14 ApplicationManager* manager, | 14 ApplicationManager* manager, |
| 15 const GURL& requested_url, | 15 const GURL& requested_url, |
| 16 const GURL& url) | 16 const GURL& url) |
| 17 : ShellImpl(manager, requested_url, url) { | 17 : ShellImpl(manager, requested_url, url) { |
| 18 binding_.Bind(handle.Pass()); | 18 binding_.Bind(handle.Pass()); |
| 19 } | 19 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 } | 57 } |
| 58 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), | 58 manager_->ConnectToApplication(app_gurl, url_, services.Pass(), |
| 59 exposed_services.Pass()); | 59 exposed_services.Pass()); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void ShellImpl::OnConnectionError() { | 62 void ShellImpl::OnConnectionError() { |
| 63 manager_->OnShellImplError(this); | 63 manager_->OnShellImplError(this); |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace mojo | 66 } // namespace mojo |
| OLD | NEW |