content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java - Issue 141223002: Move the android library loader from content to base

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 141223002: Move the android library loader from content to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix final nits 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

« base/base.gypi ('K') | « content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/LinkerTests.java ('k') | content/shell/android/shell_library_loader.cc » ('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 6534da4a84a803574346b49577ea22330c4b8e03..0e5aa74d3d068e1c22de0a97877bf43a541b9bc2 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

@@ -16,7 +16,8 @@ import android.widget.Toast;

import org.chromium.base.BaseSwitches;

import org.chromium.base.CommandLine;

import org.chromium.base.MemoryPressureListener;

-import org.chromium.content.app.LibraryLoader;

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

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

import org.chromium.content.browser.ActivityContentVideoViewClient;

import org.chromium.content.browser.BrowserStartupController;

import org.chromium.content.browser.ContentVideoViewClient;

@@ -24,7 +25,6 @@ import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewClient;

import org.chromium.content.browser.DeviceUtils;

import org.chromium.content.common.ContentSwitches;

-import org.chromium.content.common.ProcessInitException;

import org.chromium.content_shell.Shell;

import org.chromium.content_shell.ShellManager;

import org.chromium.ui.base.ActivityWindowAndroid;