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

Side by Side Diff: content/browser/android/browser_jni_registrar.cc

Issue 24152015: [Android] JNI binding for MediaDrmCredentialManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase against trunk Created 7 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 unified diff | Download patch
OLDNEW
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 "content/browser/android/browser_jni_registrar.h" 5 #include "content/browser/android/browser_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "content/browser/accessibility/browser_accessibility_android.h" 9 #include "content/browser/accessibility/browser_accessibility_android.h"
10 #include "content/browser/accessibility/browser_accessibility_manager_android.h" 10 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
11 #include "content/browser/android/browser_startup_controller.h" 11 #include "content/browser/android/browser_startup_controller.h"
12 #include "content/browser/android/child_process_launcher_android.h" 12 #include "content/browser/android/child_process_launcher_android.h"
13 #include "content/browser/android/content_settings.h" 13 #include "content/browser/android/content_settings.h"
14 #include "content/browser/android/content_video_view.h" 14 #include "content/browser/android/content_video_view.h"
15 #include "content/browser/android/content_view_core_impl.h" 15 #include "content/browser/android/content_view_core_impl.h"
16 #include "content/browser/android/content_view_render_view.h" 16 #include "content/browser/android/content_view_render_view.h"
17 #include "content/browser/android/content_view_statics.h" 17 #include "content/browser/android/content_view_statics.h"
18 #include "content/browser/android/date_time_chooser_android.h" 18 #include "content/browser/android/date_time_chooser_android.h"
19 #include "content/browser/android/download_controller_android_impl.h" 19 #include "content/browser/android/download_controller_android_impl.h"
20 #include "content/browser/android/interstitial_page_delegate_android.h" 20 #include "content/browser/android/interstitial_page_delegate_android.h"
21 #include "content/browser/android/load_url_params.h" 21 #include "content/browser/android/load_url_params.h"
22 #include "content/browser/android/surface_texture_peer_browser_impl.h" 22 #include "content/browser/android/surface_texture_peer_browser_impl.h"
23 #include "content/browser/android/touch_point.h" 23 #include "content/browser/android/touch_point.h"
24 #include "content/browser/android/tracing_intent_handler.h" 24 #include "content/browser/android/tracing_intent_handler.h"
25 #include "content/browser/android/vibration_message_filter.h" 25 #include "content/browser/android/vibration_message_filter.h"
26 #include "content/browser/android/web_contents_observer_android.h" 26 #include "content/browser/android/web_contents_observer_android.h"
27 #include "content/browser/device_orientation/data_fetcher_impl_android.h" 27 #include "content/browser/device_orientation/data_fetcher_impl_android.h"
28 #include "content/browser/geolocation/location_api_adapter_android.h" 28 #include "content/browser/geolocation/location_api_adapter_android.h"
29 #include "content/browser/media/android/media_drm_credential_manager.h"
29 #include "content/browser/media/android/media_resource_getter_impl.h" 30 #include "content/browser/media/android/media_resource_getter_impl.h"
30 #include "content/browser/power_save_blocker_android.h" 31 #include "content/browser/power_save_blocker_android.h"
31 #include "content/browser/renderer_host/ime_adapter_android.h" 32 #include "content/browser/renderer_host/ime_adapter_android.h"
32 #include "content/browser/renderer_host/java/java_bound_object.h" 33 #include "content/browser/renderer_host/java/java_bound_object.h"
33 #include "content/browser/speech/speech_recognizer_impl_android.h" 34 #include "content/browser/speech/speech_recognizer_impl_android.h"
34 35
35 using content::SurfaceTexturePeerBrowserImpl; 36 using content::SurfaceTexturePeerBrowserImpl;
36 37
37 namespace { 38 namespace {
38 base::android::RegistrationMethod kContentRegisteredMethods[] = { 39 base::android::RegistrationMethod kContentRegisteredMethods[] = {
39 {"AndroidLocationApiAdapter", 40 {"AndroidLocationApiAdapter",
40 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 41 content::AndroidLocationApiAdapter::RegisterGeolocationService},
41 {"BrowserAccessibilityManager", 42 {"BrowserAccessibilityManager",
42 content::RegisterBrowserAccessibilityManager}, 43 content::RegisterBrowserAccessibilityManager},
43 {"BrowserStartupController", content::RegisterBrowserStartupController}, 44 {"BrowserStartupController", content::RegisterBrowserStartupController},
44 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, 45 {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
45 {"ContentSettings", content::ContentSettings::RegisterContentSettings}, 46 {"ContentSettings", content::ContentSettings::RegisterContentSettings},
46 {"ContentViewRenderView", 47 {"ContentViewRenderView",
47 content::ContentViewRenderView::RegisterContentViewRenderView}, 48 content::ContentViewRenderView::RegisterContentViewRenderView},
48 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, 49 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
49 {"ContentViewCore", content::RegisterContentViewCore}, 50 {"ContentViewCore", content::RegisterContentViewCore},
50 {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register}, 51 {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register},
51 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 52 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
52 {"DownloadControllerAndroidImpl", 53 {"DownloadControllerAndroidImpl",
53 content::DownloadControllerAndroidImpl::RegisterDownloadController}, 54 content::DownloadControllerAndroidImpl::RegisterDownloadController},
54 {"InterstitialPageDelegateAndroid", 55 {"InterstitialPageDelegateAndroid",
55 content::InterstitialPageDelegateAndroid:: 56 content::InterstitialPageDelegateAndroid::
56 RegisterInterstitialPageDelegateAndroid}, 57 RegisterInterstitialPageDelegateAndroid},
58 {"MediaDrmCredentialManager",
59 content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},
57 {"MediaResourceGetterImpl", 60 {"MediaResourceGetterImpl",
58 content::MediaResourceGetterImpl::RegisterMediaResourceGetter}, 61 content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
59 {"LoadUrlParams", content::RegisterLoadUrlParams}, 62 {"LoadUrlParams", content::RegisterLoadUrlParams},
60 {"PowerSaveBlock", content::RegisterPowerSaveBlocker}, 63 {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
61 {"RegisterImeAdapter", content::RegisterImeAdapter}, 64 {"RegisterImeAdapter", content::RegisterImeAdapter},
62 {"SpeechRecognizerImplAndroid", 65 {"SpeechRecognizerImplAndroid",
63 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, 66 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
64 {"TouchPoint", content::RegisterTouchPoint}, 67 {"TouchPoint", content::RegisterTouchPoint},
65 {"TracingIntentHandler", content::RegisterTracingIntentHandler}, 68 {"TracingIntentHandler", content::RegisterTracingIntentHandler},
66 {"VibrationMessageFilter", content::VibrationMessageFilter::Register}, 69 {"VibrationMessageFilter", content::VibrationMessageFilter::Register},
67 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid}, 70 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},
68 {"WebViewStatics", content::RegisterWebViewStatics}, }; 71 {"WebViewStatics", content::RegisterWebViewStatics}, };
69 72
70 } // namespace 73 } // namespace
71 74
72 namespace content { 75 namespace content {
73 namespace android { 76 namespace android {
74 77
75 bool RegisterBrowserJni(JNIEnv* env) { 78 bool RegisterBrowserJni(JNIEnv* env) {
76 return RegisterNativeMethods(env, kContentRegisteredMethods, 79 return RegisterNativeMethods(env, kContentRegisteredMethods,
77 arraysize(kContentRegisteredMethods)); 80 arraysize(kContentRegisteredMethods));
78 } 81 }
79 82
80 } // namespace android 83 } // namespace android
81 } // namespace content 84 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698