| 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/ui_application_loader_android.h" | 5 #include "shell/android/ui_application_loader_android.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "shell/application_manager/application_manager.h" | 9 #include "shell/application_manager/application_manager.h" |
| 10 | 10 |
| 11 namespace mojo { | |
| 12 namespace shell { | 11 namespace shell { |
| 13 | 12 |
| 14 UIApplicationLoader::UIApplicationLoader( | 13 UIApplicationLoader::UIApplicationLoader( |
| 15 scoped_ptr<ApplicationLoader> real_loader, | 14 scoped_ptr<ApplicationLoader> real_loader, |
| 16 base::MessageLoop* ui_message_loop) | 15 base::MessageLoop* ui_message_loop) |
| 17 : loader_(real_loader.Pass()), ui_message_loop_(ui_message_loop) { | 16 : loader_(real_loader.Pass()), ui_message_loop_(ui_message_loop) { |
| 18 } | 17 } |
| 19 | 18 |
| 20 UIApplicationLoader::~UIApplicationLoader() { | 19 UIApplicationLoader::~UIApplicationLoader() { |
| 21 ui_message_loop_->PostTask( | 20 ui_message_loop_->PostTask( |
| 22 FROM_HERE, base::Bind(&UIApplicationLoader::ShutdownOnUIThread, | 21 FROM_HERE, base::Bind(&UIApplicationLoader::ShutdownOnUIThread, |
| 23 base::Unretained(this))); | 22 base::Unretained(this))); |
| 24 } | 23 } |
| 25 | 24 |
| 26 void UIApplicationLoader::Load( | 25 void UIApplicationLoader::Load( |
| 27 const GURL& url, | 26 const GURL& url, |
| 28 InterfaceRequest<Application> application_request) { | 27 mojo::InterfaceRequest<mojo::Application> application_request) { |
| 29 DCHECK(application_request.is_pending()); | 28 DCHECK(application_request.is_pending()); |
| 30 ui_message_loop_->PostTask( | 29 ui_message_loop_->PostTask( |
| 31 FROM_HERE, | 30 FROM_HERE, |
| 32 base::Bind(&UIApplicationLoader::LoadOnUIThread, base::Unretained(this), | 31 base::Bind(&UIApplicationLoader::LoadOnUIThread, base::Unretained(this), |
| 33 url, base::Passed(&application_request))); | 32 url, base::Passed(&application_request))); |
| 34 } | 33 } |
| 35 | 34 |
| 36 void UIApplicationLoader::LoadOnUIThread( | 35 void UIApplicationLoader::LoadOnUIThread( |
| 37 const GURL& url, | 36 const GURL& url, |
| 38 InterfaceRequest<Application> application_request) { | 37 mojo::InterfaceRequest<mojo::Application> application_request) { |
| 39 loader_->Load(url, application_request.Pass()); | 38 loader_->Load(url, application_request.Pass()); |
| 40 } | 39 } |
| 41 | 40 |
| 42 void UIApplicationLoader::ShutdownOnUIThread() { | 41 void UIApplicationLoader::ShutdownOnUIThread() { |
| 43 // Destroy |loader_| on the thread it's actually used on. | 42 // Destroy |loader_| on the thread it's actually used on. |
| 44 loader_.reset(); | 43 loader_.reset(); |
| 45 } | 44 } |
| 46 | 45 |
| 47 } // namespace shell | 46 } // namespace shell |
| 48 } // namespace mojo | |
| OLD | NEW |