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

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

Issue 16781002: Vibration API: plumbing from Blink to Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 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 unified diff | Download patch
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/android/vibration_message_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/android_browser_process.h" 11 #include "content/browser/android/android_browser_process.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/media_resource_getter_impl.h" 22 #include "content/browser/android/media_resource_getter_impl.h"
23 #include "content/browser/android/surface_texture_peer_browser_impl.h" 23 #include "content/browser/android/surface_texture_peer_browser_impl.h"
24 #include "content/browser/android/touch_point.h" 24 #include "content/browser/android/touch_point.h"
25 #include "content/browser/android/tracing_intent_handler.h" 25 #include "content/browser/android/tracing_intent_handler.h"
26 #include "content/browser/android/vibration_message_filter.h"
26 #include "content/browser/android/web_contents_observer_android.h" 27 #include "content/browser/android/web_contents_observer_android.h"
27 #include "content/browser/geolocation/location_api_adapter_android.h" 28 #include "content/browser/geolocation/location_api_adapter_android.h"
28 #include "content/browser/renderer_host/ime_adapter_android.h" 29 #include "content/browser/renderer_host/ime_adapter_android.h"
29 #include "content/browser/renderer_host/java/java_bound_object.h" 30 #include "content/browser/renderer_host/java/java_bound_object.h"
30 #include "content/browser/speech/speech_recognizer_impl_android.h" 31 #include "content/browser/speech/speech_recognizer_impl_android.h"
31 32
32 using content::SurfaceTexturePeerBrowserImpl; 33 using content::SurfaceTexturePeerBrowserImpl;
33 34
34 namespace { 35 namespace {
35 base::android::RegistrationMethod kContentRegisteredMethods[] = { 36 base::android::RegistrationMethod kContentRegisteredMethods[] = {
(...skipping 15 matching lines...) Expand all
51 content::InterstitialPageDelegateAndroid 52 content::InterstitialPageDelegateAndroid
52 ::RegisterInterstitialPageDelegateAndroid }, 53 ::RegisterInterstitialPageDelegateAndroid },
53 { "MediaResourceGetterImpl", 54 { "MediaResourceGetterImpl",
54 content::MediaResourceGetterImpl::RegisterMediaResourceGetter }, 55 content::MediaResourceGetterImpl::RegisterMediaResourceGetter },
55 { "LoadUrlParams", content::RegisterLoadUrlParams }, 56 { "LoadUrlParams", content::RegisterLoadUrlParams },
56 { "RegisterImeAdapter", content::RegisterImeAdapter }, 57 { "RegisterImeAdapter", content::RegisterImeAdapter },
57 { "SpeechRecognizerImplAndroid", 58 { "SpeechRecognizerImplAndroid",
58 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer }, 59 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer },
59 { "TouchPoint", content::RegisterTouchPoint }, 60 { "TouchPoint", content::RegisterTouchPoint },
60 { "TracingIntentHandler", content::RegisterTracingIntentHandler }, 61 { "TracingIntentHandler", content::RegisterTracingIntentHandler },
62 { "VibrationMessageFilter", content::VibrationMessageFilter::Register },
61 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, 63 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
62 { "WebViewStatics", content::RegisterWebViewStatics }, 64 { "WebViewStatics", content::RegisterWebViewStatics },
63 }; 65 };
64 66
65 } // namespace 67 } // namespace
66 68
67 namespace content { 69 namespace content {
68 namespace android { 70 namespace android {
69 71
70 bool RegisterBrowserJni(JNIEnv* env) { 72 bool RegisterBrowserJni(JNIEnv* env) {
71 return RegisterNativeMethods(env, kContentRegisteredMethods, 73 return RegisterNativeMethods(env, kContentRegisteredMethods,
72 arraysize(kContentRegisteredMethods)); 74 arraysize(kContentRegisteredMethods));
73 } 75 }
74 76
75 } // namespace android 77 } // namespace android
76 } // namespace content 78 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/android/vibration_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698