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

Unified Diff: android_webview/native/android_webview_jni_registrar.cc

Issue 401743003: [android_webview] Introduce AwAssets to reference assets inside the apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pakfiles
Patch Set: Created 6 years, 5 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/native/android_webview_jni_registrar.cc
diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc
index 8db97137c7cc3a4383b7f348e9bc7acc4f4fddd2..f99f5e54b67b13bf7fd6c82e022136ba317a307e 100644
--- a/android_webview/native/android_webview_jni_registrar.cc
+++ b/android_webview/native/android_webview_jni_registrar.cc
@@ -5,6 +5,7 @@
#include "android_webview/native/android_webview_jni_registrar.h"
#include "android_webview/native/android_protocol_handler.h"
+#include "android_webview/native/aw_assets.h"
#include "android_webview/native/aw_autofill_client.h"
#include "android_webview/native/aw_contents.h"
#include "android_webview/native/aw_contents_client_bridge.h"
@@ -32,30 +33,31 @@
namespace android_webview {
static base::android::RegistrationMethod kWebViewRegisteredMethods[] = {
- // Register JNI for android_webview classes.
- { "AndroidProtocolHandler", RegisterAndroidProtocolHandler },
- { "AwAutofillClient", RegisterAwAutofillClient },
- { "AwContents", RegisterAwContents },
- { "AwContentsClientBridge", RegisterAwContentsClientBridge },
- { "AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl },
- { "AwContentsStatics", RegisterAwContentsStatics },
- { "AwDevToolsServer", RegisterAwDevToolsServer },
- { "AwFormDatabase", RegisterAwFormDatabase },
- { "AwPicture", RegisterAwPicture },
- { "AwSettings", RegisterAwSettings },
- { "AwHttpAuthHandler", RegisterAwHttpAuthHandler },
- { "AwPdfExporter", RegisterAwPdfExporter },
- { "AwPermissionRequest", RegisterAwPermissionRequest },
- { "AwQuotaManagerBridge", RegisterAwQuotaManagerBridge },
- { "AwResource", AwResource::RegisterAwResource },
- { "AwWebContentsDelegate", RegisterAwWebContentsDelegate },
- { "CookieManager", RegisterCookieManager },
+ // Register JNI for android_webview classes.
mkosiba (inactive) 2014/07/18 05:49:05 is the indent change really needed? the old versio
Primiano Tucci (use gerrit) 2014/07/18 17:03:30 Ah, I usually tend to trust clang-format, but in t
+ {"AndroidProtocolHandler", RegisterAndroidProtocolHandler},
+ {"AwAssets", RegisterAwAssets},
+ {"AwAutofillClient", RegisterAwAutofillClient},
+ {"AwContents", RegisterAwContents},
+ {"AwContentsClientBridge", RegisterAwContentsClientBridge},
+ {"AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl},
+ {"AwContentsStatics", RegisterAwContentsStatics},
+ {"AwDevToolsServer", RegisterAwDevToolsServer},
+ {"AwFormDatabase", RegisterAwFormDatabase},
+ {"AwPicture", RegisterAwPicture},
+ {"AwSettings", RegisterAwSettings},
+ {"AwHttpAuthHandler", RegisterAwHttpAuthHandler},
+ {"AwPdfExporter", RegisterAwPdfExporter},
+ {"AwPermissionRequest", RegisterAwPermissionRequest},
+ {"AwQuotaManagerBridge", RegisterAwQuotaManagerBridge},
+ {"AwResource", AwResource::RegisterAwResource},
+ {"AwWebContentsDelegate", RegisterAwWebContentsDelegate},
+ {"CookieManager", RegisterCookieManager},
#if defined(VIDEO_HOLE)
- { "ExternalVideoSurfaceContainer", RegisterExternalVideoSurfaceContainer },
+ {"ExternalVideoSurfaceContainer", RegisterExternalVideoSurfaceContainer},
#endif
- { "AwWebResourceResponseImpl", RegisterAwWebResourceResponse },
- { "InputStream", RegisterInputStream },
- { "JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper },
+ {"AwWebResourceResponseImpl", RegisterAwWebResourceResponse},
+ {"InputStream", RegisterInputStream},
+ {"JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper},
};
bool RegisterJni(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698