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

Unified Diff: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java

Issue 1917193003: Revert of 🍈 Unify application context usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
index d53701dfa427faf6c748fbfb49a3d8788b1d4b85..6c97f4c8b35293bc1849bafbbf995d702b82d87e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java
@@ -7,6 +7,7 @@
import android.content.Context;
import android.os.Handler;
+import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.base.ResourceExtractor;
import org.chromium.base.ThreadUtils;
@@ -291,6 +292,7 @@
// TODO(yfriedman): Remove dependency on a command line flag for this.
DeviceUtils.addDeviceSpecificUserAgentSwitch(mContext);
+ ContextUtils.initApplicationContext(mContext);
nativeSetCommandLineFlags(
singleProcess, nativeIsPluginEnabled() ? getPlugins() : null);
mPostResourceExtractionTasksCompleted = true;
@@ -317,6 +319,8 @@
ResourceExtractor resourceExtractor = ResourceExtractor.get(mContext);
resourceExtractor.startExtractingResources();
resourceExtractor.waitForCompletion();
+
+ ContextUtils.initApplicationContext(mContext.getApplicationContext());
nativeSetCommandLineFlags(false, null);
}

Powered by Google App Engine
This is Rietveld 408576698