chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java - Issue 897683003: Know the process shared library loaded in

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: chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

Issue 897683003: Know the process shared library loaded in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix again Created 5 years, 10 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 | « chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

index c9d36110ef4363889c9cb317f522f28b33a98d6b..960dcc3ed896f7a6576dcee14210657c165b04a6 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/NativeInitializationController.java

@@ -12,6 +12,7 @@ import android.util.Log;

import org.chromium.base.ThreadUtils;

import org.chromium.base.library_loader.LibraryLoader;

+import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.browser.ChildProcessLauncher;

@@ -77,7 +78,8 @@ class NativeInitializationController {

@Override

public void run() {

try {

- LibraryLoader.ensureInitialized(mContext.getApplicationContext(), true);

+ LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)

+ .ensureInitialized(mContext.getApplicationContext(), true);

} catch (ProcessInitException e) {

Log.e(TAG, "Unable to load native library.", e);

mActivityDelegate.onStartupFailure();

@@ -143,7 +145,14 @@ class NativeInitializationController {

onResume();

}

- LibraryLoader.onNativeInitializationComplete(mContext.getApplicationContext());

+ try {

+ LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)

+ .onNativeInitializationComplete(mContext.getApplicationContext());

+ } catch (ProcessInitException e) {

+ Log.e(TAG, "Unable to load native library.", e);

+ mActivityDelegate.onStartupFailure();

+ return;

+ }

}

/**