| Index: shell/android/mojo_main.cc
|
| diff --git a/shell/android/mojo_main.cc b/shell/android/mojo_main.cc
|
| index a91ef2f4f28a647eab557d4b2d83fd0ece92d5e9..4b0433aa4e8ac19791be2b593d2e529003d45537 100644
|
| --- a/shell/android/mojo_main.cc
|
| +++ b/shell/android/mojo_main.cc
|
| @@ -19,10 +19,10 @@
|
| #include "jni/MojoMain_jni.h"
|
| #include "mojo/application_manager/application_loader.h"
|
| #include "mojo/application_manager/application_manager.h"
|
| -#include "mojo/application_manager/background_shell_application_loader.h"
|
| #include "services/gles2/gpu_impl.h"
|
| #include "services/native_viewport/native_viewport_impl.h"
|
| #include "shell/android/android_handler_loader.h"
|
| +#include "shell/android/background_application_loader.h"
|
| #include "shell/android/ui_application_loader_android.h"
|
| #include "shell/context.h"
|
| #include "shell/init.h"
|
| @@ -101,7 +101,7 @@ void ConfigureAndroidServices(Context* context) {
|
| // MojoShell application as the JNI bridge to bootstrap execution of other
|
| // Android Mojo apps that need JNI.
|
| context->application_manager()->SetLoaderForURL(
|
| - make_scoped_ptr(new BackgroundShellApplicationLoader(
|
| + make_scoped_ptr(new BackgroundApplicationLoader(
|
| make_scoped_ptr(new AndroidHandlerLoader()), "android_handler",
|
| base::MessageLoop::TYPE_DEFAULT)),
|
| GURL("mojo:android_handler"));
|
|
|