content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 2247143004: Remove app context init from LibraryLoader.

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/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

Issue 2247143004: Remove app context init from LibraryLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix ChildProcessServiceImpl. Created 4 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

« base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java ('K') | « content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java ('k') | mojo/android/javatests/src/org/chromium/mojo/MojoTestCase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

index 881bfc0fe488378699dbba72edd7ddcad11bfac9..c663d9032a8dd1f7fb0966c2c07a9dc131ad1ece 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java

@@ -14,6 +14,7 @@ import android.widget.Toast;

import org.chromium.base.BaseSwitches;

import org.chromium.base.CommandLine;

+import org.chromium.base.ContextUtils;

import org.chromium.base.MemoryPressureListener;

import org.chromium.base.annotations.SuppressFBWarnings;

import org.chromium.base.library_loader.LibraryLoader;

@@ -60,9 +61,10 @@ public class ContentShellActivity extends Activity {

waitForDebuggerIfNeeded();

DeviceUtils.addDeviceSpecificUserAgentSwitch(this);

+ ContextUtils.initApplicationContext(getApplicationContext());

try {

- LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)

- .ensureInitialized(getApplicationContext());

+ LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();

} catch (ProcessInitException e) {

Log.e(TAG, "ContentView initialization failed.", e);

// Since the library failed to initialize nothing in the application