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

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

Issue 2345143002: Move language pak files to assets. (Closed)
Patch Set: Added srcjar_deps for chrome_apk targets 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
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 2ef597bfab1af55fa202d279a6c2850544ddf6dd..b461f06d5babd68b91ceae4013976ccb5d22c611 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,7 +47,7 @@ import org.chromium.android_webview.AwResource;
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.LocalePakFiles;
import org.chromium.android_webview.ResourcesContextWrapperFactory;
import org.chromium.base.BuildConfig;
import org.chromium.base.CommandLine;
@@ -385,7 +385,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
// Make sure that ResourceProvider is initialized before starting the browser process.
final String webViewPackageName = WebViewFactory.getLoadedPackageInfo().packageName;
setUpResources(webViewPackageName, context);
- ResourceBundle.initializeLocalePaks(context, R.array.locale_paks);
+ ResourceBundle.initializeLocalePaks(context, LocalePakFiles.getFiles());
initPlatSupportLibrary();
initNetworkChangeNotifier(context);
final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE;

Powered by Google App Engine
This is Rietveld 408576698