summaryrefslogtreecommitdiffstats
path: root/android_webview/glue
diff options
context:
space:
mode:
authoragrieve <agrieve@chromium.org>2015-06-25 12:55:34 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-25 19:56:06 +0000
commitbffa19f30776f745fc5f6aef5881113781f3bd41 (patch)
treeb14ba4fca680b3e78c0691f79c94a46442266944 /android_webview/glue
parent28df4d1101e58d3d99e155158e9bacd0e0739af5 (diff)
downloadchromium_src-bffa19f30776f745fc5f6aef5881113781f3bd41.zip
chromium_src-bffa19f30776f745fc5f6aef5881113781f3bd41.tar.gz
chromium_src-bffa19f30776f745fc5f6aef5881113781f3bd41.tar.bz2
Convert Android WebView to store locale .pak files as res/raw resources
Motivation for this is to have webview be consistent with chrome in how it bundles these. It does also have the side-effect of improving the look-up time for LocaleDataPakExists. BUG=371610 Review URL: https://codereview.chromium.org/1193613002 Cr-Commit-Position: refs/heads/master@{#336237}
Diffstat (limited to 'android_webview/glue')
-rw-r--r--android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java3
1 files changed, 3 insertions, 0 deletions
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 c1d1658..9858435 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);