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

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

Issue 1216703003: [android] Remove unpack library fallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak documentation to not allow null context 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 | « no previous file | android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java » ('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 985843584dc9de8b8c969da5d81e13d876fbc6f6..30ea4a794dd9947ac3d558d2061563131419a998 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
@@ -231,8 +231,9 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
return;
}
+ Context context = getWrappedCurrentApplicationContext();
try {
- LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized();
+ LibraryLoader.get(LibraryProcessType.PROCESS_WEBVIEW).ensureInitialized(context);
} catch (ProcessInitException e) {
throw new RuntimeException("Error initializing WebView library", e);
}
@@ -241,7 +242,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
PathService.override(DIR_RESOURCE_PAKS_ANDROID, "/system/framework/webview/paks");
// Make sure that ResourceProvider is initialized before starting the browser process.
- Context context = getWrappedCurrentApplicationContext();
setUpResources(context);
ResourceBundle.initializeLocalePaks(context, R.array.locale_paks);
initPlatSupportLibrary();
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698