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