content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java - Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

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/ContentShellApplication.java

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks

Patch Set: Fix content_browsertests Created 5 years, 6 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/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java ('k') | content/shell/app/shell_main_delegate.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/ContentShellApplication.java

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

index f97e6b030d315bcf33fa944f35bd291351f469c8..8cff2b165e05f29f406440f2888a8c62e3b9bfcd 100644

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

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

@@ -16,9 +16,6 @@ import org.chromium.content.app.ContentApplication;

public class ContentShellApplication extends ContentApplication {

public static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line";

- private static final String[] MANDATORY_PAK_FILES = new String[] {

- "content_shell.pak",

- };

private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";

@Override

@@ -28,7 +25,7 @@ public class ContentShellApplication extends ContentApplication {

@Override

protected void initializeLibraryDependencies() {

- ResourceExtractor.setMandatoryPaksToExtract(0, MANDATORY_PAK_FILES);

+ ResourceExtractor.setMandatoryPaksToExtract(0);

PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);

}