content/public/android/java/src/org/chromium/content/app/ChildProcessService.java - Issue 1471273002: Remove ContentMain.initApplicationContext.

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/app/ChildProcessService.java

Issue 1471273002: Remove ContentMain.initApplicationContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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 | « android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java ('k') | content/public/android/java/src/org/chromium/content/app/ContentMain.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/app/ChildProcessService.java

diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

index 98538e46bcc6b03205dca38467516344a9e16232..5201472c39d3ca9bbbdc55ecfa93c2cb5f424e00 100644

--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java

@@ -17,6 +17,7 @@ import android.view.Surface;

import org.chromium.base.BaseSwitches;

import org.chromium.base.CommandLine;

+import org.chromium.base.ContextUtils;

import org.chromium.base.Log;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

@@ -211,7 +212,7 @@ public class ChildProcessService extends Service {

mMainThread.wait();

}

- ContentMain.initApplicationContext(sContext.get().getApplicationContext());

+ ContextUtils.initApplicationContext(sContext.get().getApplicationContext());

for (FileDescriptorInfo fdInfo : mFdInfos) {

nativeRegisterGlobalFileDescriptor(

fdInfo.mId, fdInfo.mFd.detachFd(), fdInfo.mOffset, fdInfo.mSize);