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

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

Issue 583663003: Vibration API : migrate to device/vibration using mojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove debug logging Created 6 years, 2 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"
(...skipping 21 matching lines...) Expand all
32 #include "content/browser/geolocation/location_api_adapter_android.h" 32 #include "content/browser/geolocation/location_api_adapter_android.h"
33 #include "content/browser/media/android/media_drm_credential_manager.h" 33 #include "content/browser/media/android/media_drm_credential_manager.h"
34 #include "content/browser/media/android/media_resource_getter_impl.h" 34 #include "content/browser/media/android/media_resource_getter_impl.h"
35 #include "content/browser/power_save_blocker_android.h" 35 #include "content/browser/power_save_blocker_android.h"
36 #include "content/browser/renderer_host/ime_adapter_android.h" 36 #include "content/browser/renderer_host/ime_adapter_android.h"
37 #include "content/browser/renderer_host/input/motion_event_android.h" 37 #include "content/browser/renderer_host/input/motion_event_android.h"
38 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h " 38 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h "
39 #include "content/browser/screen_orientation/screen_orientation_provider_android .h" 39 #include "content/browser/screen_orientation/screen_orientation_provider_android .h"
40 #include "content/browser/speech/speech_recognizer_impl_android.h" 40 #include "content/browser/speech/speech_recognizer_impl_android.h"
41 #include "content/browser/time_zone_monitor_android.h" 41 #include "content/browser/time_zone_monitor_android.h"
42 #include "content/browser/vibration/vibration_provider_android.h"
43 #include "content/browser/web_contents/web_contents_android.h" 42 #include "content/browser/web_contents/web_contents_android.h"
44 43
45 using content::SurfaceTexturePeerBrowserImpl; 44 using content::SurfaceTexturePeerBrowserImpl;
46 45
47 namespace { 46 namespace {
48 base::android::RegistrationMethod kContentRegisteredMethods[] = { 47 base::android::RegistrationMethod kContentRegisteredMethods[] = {
49 {"AndroidLocationApiAdapter", 48 {"AndroidLocationApiAdapter",
50 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 49 content::AndroidLocationApiAdapter::RegisterGeolocationService},
51 {"BatteryStatusManager", content::BatteryStatusManagerAndroid::Register}, 50 {"BatteryStatusManager", content::BatteryStatusManagerAndroid::Register},
52 {"BrowserAccessibilityManager", 51 {"BrowserAccessibilityManager",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 {"RegisterImeAdapter", content::RegisterImeAdapter}, 84 {"RegisterImeAdapter", content::RegisterImeAdapter},
86 {"ScreenOrientationProvider", 85 {"ScreenOrientationProvider",
87 content::ScreenOrientationProviderAndroid::Register}, 86 content::ScreenOrientationProviderAndroid::Register},
88 {"SensorManagerAndroid", content::SensorManagerAndroid::Register}, 87 {"SensorManagerAndroid", content::SensorManagerAndroid::Register},
89 {"SpeechRecognizerImplAndroid", 88 {"SpeechRecognizerImplAndroid",
90 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, 89 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
91 {"TimeZoneMonitorAndroid", content::TimeZoneMonitorAndroid::Register}, 90 {"TimeZoneMonitorAndroid", content::TimeZoneMonitorAndroid::Register},
92 {"TouchEventSynthesizer", 91 {"TouchEventSynthesizer",
93 content::SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer}, 92 content::SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer},
94 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid}, 93 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
95 {"VibrationProvider", content::VibrationProviderAndroid::Register},
96 {"WebContentsAndroid", content::WebContentsAndroid::Register}, 94 {"WebContentsAndroid", content::WebContentsAndroid::Register},
97 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid}, 95 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},
98 {"WebViewStatics", content::RegisterWebViewStatics}, 96 {"WebViewStatics", content::RegisterWebViewStatics},
99 }; 97 };
100 98
101 } // namespace 99 } // namespace
102 100
103 namespace content { 101 namespace content {
104 namespace android { 102 namespace android {
105 103
106 bool RegisterBrowserJni(JNIEnv* env) { 104 bool RegisterBrowserJni(JNIEnv* env) {
107 return RegisterNativeMethods(env, kContentRegisteredMethods, 105 return RegisterNativeMethods(env, kContentRegisteredMethods,
108 arraysize(kContentRegisteredMethods)); 106 arraysize(kContentRegisteredMethods));
109 } 107 }
110 108
111 } // namespace android 109 } // namespace android
112 } // namespace content 110 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698