android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.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: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.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 | « android_webview/browser/aw_browser_main_parts.cc ('k') | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

index c1d1658657dadae5615515cb0c41ec02458d72e8..985843584dc9de8b8c969da5d81e13d876fbc6f6 100644

--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

@@ -37,6 +37,7 @@ import org.chromium.android_webview.AwDevToolsServer;

import org.chromium.android_webview.AwQuotaManagerBridge;

import org.chromium.android_webview.AwResource;

import org.chromium.android_webview.AwSettings;

+import org.chromium.android_webview.R;

import org.chromium.base.CommandLine;

import org.chromium.base.MemoryPressureListener;

import org.chromium.base.PathService;

@@ -48,6 +49,7 @@ import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.content.app.ContentMain;

import org.chromium.content.browser.ContentViewStatics;

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

import java.io.File;

import java.lang.ref.WeakReference;

@@ -241,6 +243,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {

// Make sure that ResourceProvider is initialized before starting the browser process.

Context context = getWrappedCurrentApplicationContext();

setUpResources(context);

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

initPlatSupportLibrary();

AwBrowserProcess.start(context);