| 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..a3632a4a3aa378630b2f84572b479657cf152c27 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,6 @@ 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.ResourcesContextWrapperFactory;
|
| import org.chromium.base.BuildConfig;
|
| import org.chromium.base.CommandLine;
|
| @@ -63,6 +62,7 @@ import org.chromium.base.library_loader.LibraryProcessType;
|
| 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 @@ 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(LocalePakFiles.getFiles());
|
| initPlatSupportLibrary();
|
| initNetworkChangeNotifier(context);
|
| final int extraBindFlags = Context.BIND_EXTERNAL_SERVICE;
|
|
|