| Index: shell/android/background_application_loader.cc
|
| diff --git a/shell/android/background_application_loader.cc b/shell/android/background_application_loader.cc
|
| index f35c45ec55d3584bda283c73d130d57f74cc5a34..849d312a625d0cef2228accde42017c93ebafb54 100644
|
| --- a/shell/android/background_application_loader.cc
|
| +++ b/shell/android/background_application_loader.cc
|
| @@ -8,7 +8,6 @@
|
| #include "base/run_loop.h"
|
| #include "shell/application_manager/application_manager.h"
|
|
|
| -namespace mojo {
|
| namespace shell {
|
|
|
| BackgroundApplicationLoader::BackgroundApplicationLoader(
|
| @@ -28,7 +27,7 @@ BackgroundApplicationLoader::~BackgroundApplicationLoader() {
|
|
|
| void BackgroundApplicationLoader::Load(
|
| const GURL& url,
|
| - InterfaceRequest<Application> application_request) {
|
| + mojo::InterfaceRequest<mojo::Application> application_request) {
|
| DCHECK(application_request.is_pending());
|
| if (!thread_) {
|
| // TODO(tim): It'd be nice if we could just have each Load call
|
| @@ -64,10 +63,9 @@ void BackgroundApplicationLoader::Run() {
|
|
|
| void BackgroundApplicationLoader::LoadOnBackgroundThread(
|
| const GURL& url,
|
| - InterfaceRequest<Application> application_request) {
|
| + mojo::InterfaceRequest<mojo::Application> application_request) {
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
| loader_->Load(url, application_request.Pass());
|
| }
|
|
|
| } // namespace shell
|
| -} // namespace mojo
|
|
|