| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android/android_handler_loader.h" | 5 #include "shell/android/android_handler_loader.h" |
| 6 | 6 |
| 7 namespace mojo { | 7 namespace mojo { |
| 8 namespace shell { | 8 namespace shell { |
| 9 | 9 |
| 10 AndroidHandlerLoader::AndroidHandlerLoader() { | 10 AndroidHandlerLoader::AndroidHandlerLoader() { |
| 11 } | 11 } |
| 12 | 12 |
| 13 AndroidHandlerLoader::~AndroidHandlerLoader() { | 13 AndroidHandlerLoader::~AndroidHandlerLoader() { |
| 14 } | 14 } |
| 15 | 15 |
| 16 void AndroidHandlerLoader::Load(ApplicationManager* manager, | 16 void AndroidHandlerLoader::Load( |
| 17 const GURL& url, | 17 ApplicationManager* manager, |
| 18 ShellPtr shell, | 18 const GURL& url, |
| 19 LoadCallback callback) { | 19 InterfaceRequest<Application> application_request, |
| 20 DCHECK(shell); | 20 LoadCallback callback) { |
| 21 application_.reset(new ApplicationImpl(&android_handler_, shell.Pass())); | 21 DCHECK(application_request.is_pending()); |
| 22 application_.reset( |
| 23 new ApplicationImpl(&android_handler_, application_request.Pass())); |
| 22 } | 24 } |
| 23 | 25 |
| 24 void AndroidHandlerLoader::OnApplicationError(ApplicationManager* manager, | 26 void AndroidHandlerLoader::OnApplicationError(ApplicationManager* manager, |
| 25 const GURL& url) { | 27 const GURL& url) { |
| 26 } | 28 } |
| 27 | 29 |
| 28 } // namespace shell | 30 } // namespace shell |
| 29 } // namespace mojo | 31 } // namespace mojo |
| OLD | NEW |