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

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

Issue 41703006: Move fling implementation from renderer to browser: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/input/fling/fling_curve.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"
(...skipping 12 matching lines...) Expand all
23 #include "content/browser/android/touch_point.h" 23 #include "content/browser/android/touch_point.h"
24 #include "content/browser/android/tracing_controller_android.h" 24 #include "content/browser/android/tracing_controller_android.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_drm_credential_manager.h"
30 #include "content/browser/media/android/media_resource_getter_impl.h" 30 #include "content/browser/media/android/media_resource_getter_impl.h"
31 #include "content/browser/power_save_blocker_android.h" 31 #include "content/browser/power_save_blocker_android.h"
32 #include "content/browser/renderer_host/ime_adapter_android.h" 32 #include "content/browser/renderer_host/ime_adapter_android.h"
33 #include "content/browser/renderer_host/input/fling/fling_curve_impl_android.h"
33 #include "content/browser/renderer_host/java/java_bound_object.h" 34 #include "content/browser/renderer_host/java/java_bound_object.h"
34 #include "content/browser/speech/speech_recognizer_impl_android.h" 35 #include "content/browser/speech/speech_recognizer_impl_android.h"
35 36
36 using content::SurfaceTexturePeerBrowserImpl; 37 using content::SurfaceTexturePeerBrowserImpl;
37 38
38 namespace { 39 namespace {
39 base::android::RegistrationMethod kContentRegisteredMethods[] = { 40 base::android::RegistrationMethod kContentRegisteredMethods[] = {
40 {"AndroidLocationApiAdapter", 41 {"AndroidLocationApiAdapter",
41 content::AndroidLocationApiAdapter::RegisterGeolocationService}, 42 content::AndroidLocationApiAdapter::RegisterGeolocationService},
42 {"BrowserAccessibilityManager", 43 {"BrowserAccessibilityManager",
43 content::RegisterBrowserAccessibilityManager}, 44 content::RegisterBrowserAccessibilityManager},
44 {"BrowserStartupController", content::RegisterBrowserStartupController}, 45 {"BrowserStartupController", content::RegisterBrowserStartupController},
45 {"ChildProcessLauncher", content::RegisterChildProcessLauncher}, 46 {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
46 {"ContentSettings", content::ContentSettings::RegisterContentSettings}, 47 {"ContentSettings", content::ContentSettings::RegisterContentSettings},
47 {"ContentViewRenderView", 48 {"ContentViewRenderView",
48 content::ContentViewRenderView::RegisterContentViewRenderView}, 49 content::ContentViewRenderView::RegisterContentViewRenderView},
49 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView}, 50 {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
50 {"ContentViewCore", content::RegisterContentViewCore}, 51 {"ContentViewCore", content::RegisterContentViewCore},
51 {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register}, 52 {"DataFetcherImplAndroid", content::DataFetcherImplAndroid::Register},
52 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 53 {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
53 {"DownloadControllerAndroidImpl", 54 {"DownloadControllerAndroidImpl",
54 content::DownloadControllerAndroidImpl::RegisterDownloadController}, 55 content::DownloadControllerAndroidImpl::RegisterDownloadController},
56 {"FlingCurveImplAndroid", content::FlingCurveImplAndroid::RegisterJni},
55 {"InterstitialPageDelegateAndroid", 57 {"InterstitialPageDelegateAndroid",
56 content::InterstitialPageDelegateAndroid:: 58 content::InterstitialPageDelegateAndroid::
57 RegisterInterstitialPageDelegateAndroid}, 59 RegisterInterstitialPageDelegateAndroid},
58 {"MediaDrmCredentialManager", 60 {"MediaDrmCredentialManager",
59 content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager}, 61 content::MediaDrmCredentialManager::RegisterMediaDrmCredentialManager},
60 {"MediaResourceGetterImpl", 62 {"MediaResourceGetterImpl",
61 content::MediaResourceGetterImpl::RegisterMediaResourceGetter}, 63 content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
62 {"LoadUrlParams", content::RegisterLoadUrlParams}, 64 {"LoadUrlParams", content::RegisterLoadUrlParams},
63 {"PowerSaveBlock", content::RegisterPowerSaveBlocker}, 65 {"PowerSaveBlock", content::RegisterPowerSaveBlocker},
64 {"RegisterImeAdapter", content::RegisterImeAdapter}, 66 {"RegisterImeAdapter", content::RegisterImeAdapter},
65 {"SpeechRecognizerImplAndroid", 67 {"SpeechRecognizerImplAndroid",
66 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer}, 68 content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
67 {"TouchPoint", content::RegisterTouchPoint}, 69 {"TouchPoint", content::RegisterTouchPoint},
68 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid}, 70 {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
69 {"VibrationMessageFilter", content::VibrationMessageFilter::Register}, 71 {"VibrationMessageFilter", content::VibrationMessageFilter::Register},
70 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid}, 72 {"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},
71 {"WebViewStatics", content::RegisterWebViewStatics}, }; 73 {"WebViewStatics", content::RegisterWebViewStatics},
74 };
72 75
73 } // namespace 76 } // namespace
74 77
75 namespace content { 78 namespace content {
76 namespace android { 79 namespace android {
77 80
78 bool RegisterBrowserJni(JNIEnv* env) { 81 bool RegisterBrowserJni(JNIEnv* env) {
79 return RegisterNativeMethods(env, kContentRegisteredMethods, 82 return RegisterNativeMethods(env, kContentRegisteredMethods,
80 arraysize(kContentRegisteredMethods)); 83 arraysize(kContentRegisteredMethods));
81 } 84 }
82 85
83 } // namespace android 86 } // namespace android
84 } // namespace content 87 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/input/fling/fling_curve.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698