chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java - Issue 1193613002: Convert Android WebView to store locale .pak files as res/raw resources

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/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

Issue 1193613002: Convert Android WebView to store locale .pak files as res/raw resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@no-extractor-init

Patch Set: rebase again 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 | « chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java ('k') | ui/android/java/src/org/chromium/ui/base/ResourceBundle.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

index e0e8283e52241b24028dd2eb58ce938de5f2bd7c..6b927820439fbbeba7c8428438f0bcff6bcf8eaf 100644

--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java

@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.smartcard.EmptyPKCS11AuthenticationManager;

import org.chromium.chrome.browser.smartcard.PKCS11AuthenticationManager;

import org.chromium.chrome.browser.sync.SyncController;

import org.chromium.chrome.shell.preferences.ChromeShellPreferences;

+import org.chromium.ui.base.ResourceBundle;

import java.util.ArrayList;

@@ -58,7 +59,8 @@ public class ChromeShellApplication extends ChromiumApplication {

@Override

protected void initializeLibraryDependencies() {

- ResourceExtractor.setMandatoryPaksToExtract(R.array.locale_paks);

+ ResourceBundle.initializeLocalePaks(this, R.array.locale_paks);

+ ResourceExtractor.setResourcesToExtract(ResourceBundle.getActiveLocaleResources());

PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);

}