Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1414)

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

Issue 2369683002: Revert of Move language pak files to assets. (Closed)
Patch Set: Created 4 years, 3 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/glue/BUILD.gn ('k') | android_webview/system_webview_apk_tmpl.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 a3632a4a3aa378630b2f84572b479657cf152c27..2ef597bfab1af55fa202d279a6c2850544ddf6dd 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
@@ -47,6 +47,7 @@
import org.chromium.android_webview.AwServiceWorkerController;
import org.chromium.android_webview.AwSettings;
import org.chromium.android_webview.HttpAuthDatabase;
+import org.chromium.android_webview.R;
import org.chromium.android_webview.ResourcesContextWrapperFactory;
import org.chromium.base.BuildConfig;
import org.chromium.base.CommandLine;
@@ -62,7 +63,6 @@
import org.chromium.base.library_loader.ProcessInitException;
import org.chromium.content.browser.ContentViewStatics;
import org.chromium.net.NetworkChangeNotifier;
-import org.chromium.ui.LocalePakFiles;
import org.chromium.ui.base.ResourceBundle;
import java.io.File;
@@ -385,7 +385,7 @@
// Make sure that ResourceProvider is initialized before starting the browser process.
final String webViewPackageName = WebViewFactory.getLoadedPackageInfo().packageName;
setUpResources(webViewPackageName, context);
- ResourceBundle.initializeLocalePaks(LocalePakFiles.getFiles());
+ ResourceBundle.initializeLocalePaks(context, R.array.locale_paks);
initPlatSupportLibrary();
initNetworkChangeNotifier(context);
final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE;
« no previous file with comments | « android_webview/glue/BUILD.gn ('k') | android_webview/system_webview_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698