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

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

Issue 1338283003: Revert of Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « mojo/runner/about_fetcher_unittest.cc ('k') | mojo/runner/child_process_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/android/main.cc
diff --git a/mojo/runner/android/main.cc b/mojo/runner/android/main.cc
index aa426869aafe2c7e22874e697a8254aabd2b18c1..d96ac1721f4ed0eabdd14a61ddaee39d69fea390 100644
--- a/mojo/runner/android/main.cc
+++ b/mojo/runner/android/main.cc
@@ -132,9 +132,9 @@
// We want ~MessageLoop to happen prior to ~Context. Initializing
// LazyInstances is akin to stack-allocating objects; their destructors
// will be invoked first-in-last-out.
- base::FilePath shell_file_root(
- base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory));
- Context* shell_context = new Context(shell_file_root);
+ Context* shell_context = new Context();
+ shell_context->SetShellFileRoot(base::FilePath(
+ base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory)));
g_context.Get().reset(shell_context);
g_java_message_loop.Get().reset(new base::MessageLoopForUI);
« no previous file with comments | « mojo/runner/about_fetcher_unittest.cc ('k') | mojo/runner/child_process_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698