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

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: rebase and clean-up Created 6 years 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/media/android/media_drm_credential_manager.h" 32 #include "content/browser/media/android/media_drm_credential_manager.h"
33 #include "content/browser/media/android/media_resource_getter_impl.h" 33 #include "content/browser/media/android/media_resource_getter_impl.h"
34 #include "content/browser/mojo/service_registry_android.h" 34 #include "content/browser/mojo/service_registry_android.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_delegate_android .h" 39 #include "content/browser/screen_orientation/screen_orientation_delegate_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 #include "mojo/android/system/core_impl.h" 43 #include "mojo/android/system/core_impl.h"
45 44
46 namespace { 45 namespace {
47 base::android::RegistrationMethod kContentRegisteredMethods[] = { 46 base::android::RegistrationMethod kContentRegisteredMethods[] = {
48 {"AndroidLocationApiAdapter", 47 {"AndroidLocationApiAdapter",
49 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 48 content::AndroidLocationApiAdapter::RegisterGeolocationService},
50 {"BrowserAccessibilityManager", 49 {"BrowserAccessibilityManager",
51 content::RegisterBrowserAccessibilityManager}, 50 content::RegisterBrowserAccessibilityManager},
52 {"BrowserStartupController", content::RegisterBrowserStartupController}, 51 {"BrowserStartupController", content::RegisterBrowserStartupController},
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 {"SensorManagerAndroid", content::SensorManagerAndroid::Register}, 87 {"SensorManagerAndroid", content::SensorManagerAndroid::Register},
89 {"ServiceRegistryAndroid", content::ServiceRegistryAndroid::Register}, 88 {"ServiceRegistryAndroid", content::ServiceRegistryAndroid::Register},
90 {"SpeechRecognizerImplAndroid", 89 {"SpeechRecognizerImplAndroid",
91 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, 90 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
92 {"SystemUIResourceManagerImpl", 91 {"SystemUIResourceManagerImpl",
93 content::SystemUIResourceManagerImpl::RegisterUIResources}, 92 content::SystemUIResourceManagerImpl::RegisterUIResources},
94 {"TimeZoneMonitorAndroid", content::TimeZoneMonitorAndroid::Register}, 93 {"TimeZoneMonitorAndroid", content::TimeZoneMonitorAndroid::Register},
95 {"TouchEventSynthesizer", 94 {"TouchEventSynthesizer",
96 content::SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer}, 95 content::SyntheticGestureTargetAndroid::RegisterTouchEventSynthesizer},
97 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid}, 96 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
98 {"VibrationProvider", content::VibrationProviderAndroid::Register},
99 {"WebContentsAndroid", content::WebContentsAndroid::Register}, 97 {"WebContentsAndroid", content::WebContentsAndroid::Register},
100 {"WebContentsObserver", content::RegisterWebContentsObserverAndroid}, 98 {"WebContentsObserver", content::RegisterWebContentsObserverAndroid},
101 {"WebViewStatics", content::RegisterWebViewStatics}, 99 {"WebViewStatics", content::RegisterWebViewStatics},
102 }; 100 };
103 101
104 } // namespace 102 } // namespace
105 103
106 namespace content { 104 namespace content {
107 namespace android { 105 namespace android {
108 106
109 bool RegisterBrowserJni(JNIEnv* env) { 107 bool RegisterBrowserJni(JNIEnv* env) {
110 return RegisterNativeMethods(env, kContentRegisteredMethods, 108 return RegisterNativeMethods(env, kContentRegisteredMethods,
111 arraysize(kContentRegisteredMethods)); 109 arraysize(kContentRegisteredMethods));
112 } 110 }
113 111
114 } // namespace android 112 } // namespace android
115 } // namespace content 113 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698