content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java - Issue 10693157: Add pak file support for content shell and android apks.

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/java/src/org/chromium/content_shell/ContentShellApplication.java

Issue 10693157: Add pak file support for content shell and android apks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 5 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/browser/ResourceExtractor.java ('k') | content/shell/android/shell_descriptors.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/ContentShellApplication.java

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

index 48239b0551244e388c12df9c37f9311b4c67da3f..72b806b89a531651351999362c304aab8711b643 100644

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

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

@@ -6,6 +6,7 @@ package org.chromium.content_shell;

import android.app.Application;

import org.chromium.content.app.LibraryLoader;

+import org.chromium.content.browser.ResourceExtractor;

/**

* Entry point for the content shell application. Handles initialization of information that needs

@@ -13,13 +14,13 @@ import org.chromium.content.app.LibraryLoader;

public class ContentShellApplication extends Application {

- // TODO(jrg): do not downstream this filename!

private static final String NATIVE_LIBRARY = "content_shell_content_view";

+ private static final String[] MANDATORY_PAK_FILES = new String[] {"content_shell.pak"};

@Override

public void onCreate() {

super.onCreate();

- // TODO(tedchoc): Initialize the .pak files to load

+ ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES);

LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY);

}