content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java - Issue 152663002: Remove shim classes etc. that were needed to move Android Loader

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 152663002: Remove shim classes etc. that were needed to move Android Loader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveLibraryLoader

Patch Set: Rebase to landed versions of predecessor CLs. Created 6 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 | « content/public/android/java/src/org/chromium/content/app/LibraryLoader.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.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 be5e2f92123646765e8f41d54a81050389696152..caad20c0c1f58289519a0506cc1f5055e451143a 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

@@ -271,13 +271,7 @@ public class BrowserStartupController {

// Normally Main.java will have already loaded the library asynchronously, we only need

// to load it here if we arrived via another flow, e.g. bookmark access & sync setup.

- // TODO(aberent): This try/catch is temporary code to ease landing the change. It can

- // be removed once the downstream changes have landed

- try {

- LibraryLoader.ensureInitialized();

- } catch (org.chromium.base.library_loader.ProcessInitException e) {

- throw new ProcessInitException(e.getErrorCode());

- }

+ LibraryLoader.ensureInitialized();

// TODO(yfriedman): Remove dependency on a command line flag for this.

DeviceUtils.addDeviceSpecificUserAgentSwitch(mContext);