Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: mojo/runner/android/main.cc

Issue 1130763004: Gets mandoline working on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: empty and old Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/runner/android/main.cc
diff --git a/mojo/runner/android/main.cc b/mojo/runner/android/main.cc
index df44e1b061beb21485828a96b307ab47b9b3c5ee..dbe65e1b95d34fffcfff80ab5c9dd7708b4867f7 100644
--- a/mojo/runner/android/main.cc
+++ b/mojo/runner/android/main.cc
@@ -23,6 +23,7 @@
#include "mojo/common/message_pump_mojo.h"
#include "mojo/runner/android/android_handler_loader.h"
#include "mojo/runner/android/background_application_loader.h"
+#include "mojo/runner/android/context_init.h"
#include "mojo/runner/android/native_viewport_application_loader.h"
#include "mojo/runner/android/ui_application_loader_android.h"
#include "mojo/runner/context.h"
@@ -166,6 +167,7 @@ static void Init(JNIEnv* env,
Context* shell_context = new Context();
shell_context->SetShellFileRoot(base::FilePath(
base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory)));
+ InitContext(shell_context);
g_context.Get().reset(shell_context);
g_java_message_loop.Get().reset(new base::MessageLoopForUI);

Powered by Google App Engine
This is Rietveld 408576698