Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "android_webview/native/android_webview_jni_registrar.h" | 5 #include "android_webview/native/android_webview_jni_registrar.h" |
| 6 | 6 |
| 7 #include "android_webview/native/android_protocol_handler.h" | 7 #include "android_webview/native/android_protocol_handler.h" |
| 8 #include "android_webview/native/aw_assets.h" | |
| 8 #include "android_webview/native/aw_autofill_client.h" | 9 #include "android_webview/native/aw_autofill_client.h" |
| 9 #include "android_webview/native/aw_contents.h" | 10 #include "android_webview/native/aw_contents.h" |
| 10 #include "android_webview/native/aw_contents_client_bridge.h" | 11 #include "android_webview/native/aw_contents_client_bridge.h" |
| 11 #include "android_webview/native/aw_contents_io_thread_client_impl.h" | 12 #include "android_webview/native/aw_contents_io_thread_client_impl.h" |
| 12 #include "android_webview/native/aw_contents_statics.h" | 13 #include "android_webview/native/aw_contents_statics.h" |
| 13 #include "android_webview/native/aw_dev_tools_server.h" | 14 #include "android_webview/native/aw_dev_tools_server.h" |
| 14 #include "android_webview/native/aw_form_database.h" | 15 #include "android_webview/native/aw_form_database.h" |
| 15 #include "android_webview/native/aw_http_auth_handler.h" | 16 #include "android_webview/native/aw_http_auth_handler.h" |
| 16 #include "android_webview/native/aw_pdf_exporter.h" | 17 #include "android_webview/native/aw_pdf_exporter.h" |
| 17 #include "android_webview/native/aw_picture.h" | 18 #include "android_webview/native/aw_picture.h" |
| 18 #include "android_webview/native/aw_quota_manager_bridge_impl.h" | 19 #include "android_webview/native/aw_quota_manager_bridge_impl.h" |
| 19 #include "android_webview/native/aw_resource.h" | 20 #include "android_webview/native/aw_resource.h" |
| 20 #include "android_webview/native/aw_settings.h" | 21 #include "android_webview/native/aw_settings.h" |
| 21 #include "android_webview/native/aw_web_contents_delegate.h" | 22 #include "android_webview/native/aw_web_contents_delegate.h" |
| 22 #include "android_webview/native/aw_web_resource_response_impl.h" | 23 #include "android_webview/native/aw_web_resource_response_impl.h" |
| 23 #include "android_webview/native/cookie_manager.h" | 24 #include "android_webview/native/cookie_manager.h" |
| 24 #include "android_webview/native/external_video_surface_container_impl.h" | 25 #include "android_webview/native/external_video_surface_container_impl.h" |
| 25 #include "android_webview/native/input_stream_impl.h" | 26 #include "android_webview/native/input_stream_impl.h" |
| 26 #include "android_webview/native/java_browser_view_renderer_helper.h" | 27 #include "android_webview/native/java_browser_view_renderer_helper.h" |
| 27 #include "android_webview/native/permission/aw_permission_request.h" | 28 #include "android_webview/native/permission/aw_permission_request.h" |
| 28 #include "base/android/jni_android.h" | 29 #include "base/android/jni_android.h" |
| 29 #include "base/android/jni_registrar.h" | 30 #include "base/android/jni_registrar.h" |
| 30 #include "base/debug/trace_event.h" | 31 #include "base/debug/trace_event.h" |
| 31 | 32 |
| 32 namespace android_webview { | 33 namespace android_webview { |
| 33 | 34 |
| 34 static base::android::RegistrationMethod kWebViewRegisteredMethods[] = { | 35 static base::android::RegistrationMethod kWebViewRegisteredMethods[] = { |
| 35 // Register JNI for android_webview classes. | 36 // 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
| |
| 36 { "AndroidProtocolHandler", RegisterAndroidProtocolHandler }, | 37 {"AndroidProtocolHandler", RegisterAndroidProtocolHandler}, |
| 37 { "AwAutofillClient", RegisterAwAutofillClient }, | 38 {"AwAssets", RegisterAwAssets}, |
| 38 { "AwContents", RegisterAwContents }, | 39 {"AwAutofillClient", RegisterAwAutofillClient}, |
| 39 { "AwContentsClientBridge", RegisterAwContentsClientBridge }, | 40 {"AwContents", RegisterAwContents}, |
| 40 { "AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl }, | 41 {"AwContentsClientBridge", RegisterAwContentsClientBridge}, |
| 41 { "AwContentsStatics", RegisterAwContentsStatics }, | 42 {"AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl}, |
| 42 { "AwDevToolsServer", RegisterAwDevToolsServer }, | 43 {"AwContentsStatics", RegisterAwContentsStatics}, |
| 43 { "AwFormDatabase", RegisterAwFormDatabase }, | 44 {"AwDevToolsServer", RegisterAwDevToolsServer}, |
| 44 { "AwPicture", RegisterAwPicture }, | 45 {"AwFormDatabase", RegisterAwFormDatabase}, |
| 45 { "AwSettings", RegisterAwSettings }, | 46 {"AwPicture", RegisterAwPicture}, |
| 46 { "AwHttpAuthHandler", RegisterAwHttpAuthHandler }, | 47 {"AwSettings", RegisterAwSettings}, |
| 47 { "AwPdfExporter", RegisterAwPdfExporter }, | 48 {"AwHttpAuthHandler", RegisterAwHttpAuthHandler}, |
| 48 { "AwPermissionRequest", RegisterAwPermissionRequest }, | 49 {"AwPdfExporter", RegisterAwPdfExporter}, |
| 49 { "AwQuotaManagerBridge", RegisterAwQuotaManagerBridge }, | 50 {"AwPermissionRequest", RegisterAwPermissionRequest}, |
| 50 { "AwResource", AwResource::RegisterAwResource }, | 51 {"AwQuotaManagerBridge", RegisterAwQuotaManagerBridge}, |
| 51 { "AwWebContentsDelegate", RegisterAwWebContentsDelegate }, | 52 {"AwResource", AwResource::RegisterAwResource}, |
| 52 { "CookieManager", RegisterCookieManager }, | 53 {"AwWebContentsDelegate", RegisterAwWebContentsDelegate}, |
| 54 {"CookieManager", RegisterCookieManager}, | |
| 53 #if defined(VIDEO_HOLE) | 55 #if defined(VIDEO_HOLE) |
| 54 { "ExternalVideoSurfaceContainer", RegisterExternalVideoSurfaceContainer }, | 56 {"ExternalVideoSurfaceContainer", RegisterExternalVideoSurfaceContainer}, |
| 55 #endif | 57 #endif |
| 56 { "AwWebResourceResponseImpl", RegisterAwWebResourceResponse }, | 58 {"AwWebResourceResponseImpl", RegisterAwWebResourceResponse}, |
| 57 { "InputStream", RegisterInputStream }, | 59 {"InputStream", RegisterInputStream}, |
| 58 { "JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper }, | 60 {"JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper}, |
| 59 }; | 61 }; |
| 60 | 62 |
| 61 bool RegisterJni(JNIEnv* env) { | 63 bool RegisterJni(JNIEnv* env) { |
| 62 TRACE_EVENT0("startup", "android_webview::RegisterJni"); | 64 TRACE_EVENT0("startup", "android_webview::RegisterJni"); |
| 63 return RegisterNativeMethods(env, | 65 return RegisterNativeMethods(env, |
| 64 kWebViewRegisteredMethods, arraysize(kWebViewRegisteredMethods)); | 66 kWebViewRegisteredMethods, arraysize(kWebViewRegisteredMethods)); |
| 65 } | 67 } |
| 66 | 68 |
| 67 } // namespace android_webview | 69 } // namespace android_webview |
| OLD | NEW |