chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.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/java/src/org/chromium/chrome/browser/ChromeMobileApplication.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 | « base/android/java/src/org/chromium/base/ResourceExtractor.java ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java

index 98fdd2a0e2ac23f5b982f585858e5c54ee161222..d3ff94ae89501e67f65c8b2b7397b39404545e9d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java

@@ -70,6 +70,7 @@ import org.chromium.content.browser.DownloadController;

import org.chromium.printing.PrintingController;

import org.chromium.ui.UiUtils;

import org.chromium.ui.base.ActivityWindowAndroid;

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

import java.lang.ref.WeakReference;

import java.util.Locale;

@@ -195,7 +196,8 @@ public class ChromeMobileApplication extends ChromiumApplication {

protected void initializeLibraryDependencies() {

// The ResourceExtractor is only needed by the browser process, but this will have no

// impact on the renderer process construction.

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

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

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

PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);

}