content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java - Issue 1917193003: Revert of 🍈 Unify application context usage.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « content/public/android/java/src/org/chromium/content/app/ChildProcessService.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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);

}