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