| 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 "mojo/shell/ui_application_loader_android.h" | 5 #include "shell/ui_application_loader_android.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "mojo/application_manager/application_manager.h" | 8 #include "mojo/application_manager/application_manager.h" |
| 9 #include "mojo/shell/context.h" | 9 #include "shell/context.h" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 | 12 |
| 13 UIApplicationLoader::UIApplicationLoader( | 13 UIApplicationLoader::UIApplicationLoader( |
| 14 scoped_ptr<ApplicationLoader> real_loader, | 14 scoped_ptr<ApplicationLoader> real_loader, |
| 15 shell::Context* context) | 15 shell::Context* context) |
| 16 : loader_(real_loader.Pass()), context_(context) { | 16 : loader_(real_loader.Pass()), context_(context) { |
| 17 } | 17 } |
| 18 | 18 |
| 19 UIApplicationLoader::~UIApplicationLoader() { | 19 UIApplicationLoader::~UIApplicationLoader() { |
| 20 context_->ui_loop()->PostTask( | 20 context_->ui_loop()->PostTask( |
| 21 FROM_HERE, | 21 FROM_HERE, base::Bind(&UIApplicationLoader::ShutdownOnUIThread, |
| 22 base::Bind(&UIApplicationLoader::ShutdownOnUIThread, | 22 base::Unretained(this))); |
| 23 base::Unretained(this))); | |
| 24 } | 23 } |
| 25 | 24 |
| 26 void UIApplicationLoader::Load(ApplicationManager* manager, | 25 void UIApplicationLoader::Load(ApplicationManager* manager, |
| 27 const GURL& url, | 26 const GURL& url, |
| 28 ScopedMessagePipeHandle shell_handle, | 27 ScopedMessagePipeHandle shell_handle, |
| 29 LoadCallback callback) { | 28 LoadCallback callback) { |
| 30 DCHECK(shell_handle.is_valid()); | 29 DCHECK(shell_handle.is_valid()); |
| 31 context_->ui_loop()->PostTask( | 30 context_->ui_loop()->PostTask( |
| 32 FROM_HERE, | 31 FROM_HERE, |
| 33 base::Bind(&UIApplicationLoader::LoadOnUIThread, base::Unretained(this), | 32 base::Bind(&UIApplicationLoader::LoadOnUIThread, base::Unretained(this), |
| 34 manager, url, base::Passed(&shell_handle))); | 33 manager, url, base::Passed(&shell_handle))); |
| 35 } | 34 } |
| 36 | 35 |
| 37 void UIApplicationLoader::OnApplicationError(ApplicationManager* manager, | 36 void UIApplicationLoader::OnApplicationError(ApplicationManager* manager, |
| 38 const GURL& url) { | 37 const GURL& url) { |
| 39 context_->ui_loop()->PostTask( | 38 context_->ui_loop()->PostTask( |
| 40 FROM_HERE, | 39 FROM_HERE, base::Bind(&UIApplicationLoader::OnApplicationErrorOnUIThread, |
| 41 base::Bind(&UIApplicationLoader::OnApplicationErrorOnUIThread, | 40 base::Unretained(this), manager, url)); |
| 42 base::Unretained(this), | |
| 43 manager, | |
| 44 url)); | |
| 45 } | 41 } |
| 46 | 42 |
| 47 void UIApplicationLoader::LoadOnUIThread(ApplicationManager* manager, | 43 void UIApplicationLoader::LoadOnUIThread(ApplicationManager* manager, |
| 48 const GURL& url, | 44 const GURL& url, |
| 49 ScopedMessagePipeHandle shell_handle) { | 45 ScopedMessagePipeHandle shell_handle) { |
| 50 loader_->Load(manager, url, shell_handle.Pass(), SimpleLoadCallback()); | 46 loader_->Load(manager, url, shell_handle.Pass(), SimpleLoadCallback()); |
| 51 } | 47 } |
| 52 | 48 |
| 53 void UIApplicationLoader::OnApplicationErrorOnUIThread( | 49 void UIApplicationLoader::OnApplicationErrorOnUIThread( |
| 54 ApplicationManager* manager, | 50 ApplicationManager* manager, |
| 55 const GURL& url) { | 51 const GURL& url) { |
| 56 loader_->OnApplicationError(manager, url); | 52 loader_->OnApplicationError(manager, url); |
| 57 } | 53 } |
| 58 | 54 |
| 59 void UIApplicationLoader::ShutdownOnUIThread() { | 55 void UIApplicationLoader::ShutdownOnUIThread() { |
| 60 // Destroy |loader_| on the thread it's actually used on. | 56 // Destroy |loader_| on the thread it's actually used on. |
| 61 loader_.reset(); | 57 loader_.reset(); |
| 62 } | 58 } |
| 63 | 59 |
| 64 } // namespace mojo | 60 } // namespace mojo |
| OLD | NEW |