| 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" | |
| 10 | 9 |
| 11 namespace shell { | 10 namespace shell { |
| 12 | 11 |
| 13 UIApplicationLoader::UIApplicationLoader( | 12 UIApplicationLoader::UIApplicationLoader( |
| 14 scoped_ptr<ApplicationLoader> real_loader, | 13 scoped_ptr<ApplicationLoader> real_loader, |
| 15 base::MessageLoop* ui_message_loop) | 14 base::MessageLoop* ui_message_loop) |
| 16 : loader_(real_loader.Pass()), ui_message_loop_(ui_message_loop) { | 15 : loader_(real_loader.Pass()), ui_message_loop_(ui_message_loop) { |
| 17 } | 16 } |
| 18 | 17 |
| 19 UIApplicationLoader::~UIApplicationLoader() { | 18 UIApplicationLoader::~UIApplicationLoader() { |
| (...skipping 17 matching lines...) Expand all Loading... |
| 37 mojo::InterfaceRequest<mojo::Application> application_request) { | 36 mojo::InterfaceRequest<mojo::Application> application_request) { |
| 38 loader_->Load(url, application_request.Pass()); | 37 loader_->Load(url, application_request.Pass()); |
| 39 } | 38 } |
| 40 | 39 |
| 41 void UIApplicationLoader::ShutdownOnUIThread() { | 40 void UIApplicationLoader::ShutdownOnUIThread() { |
| 42 // Destroy |loader_| on the thread it's actually used on. | 41 // Destroy |loader_| on the thread it's actually used on. |
| 43 loader_.reset(); | 42 loader_.reset(); |
| 44 } | 43 } |
| 45 | 44 |
| 46 } // namespace shell | 45 } // namespace shell |
| OLD | NEW |