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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/input/fling/fling_curve.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 72c7f17acdaa9707540ee2fa942eda9085624727..92f0a1920c5e7d7dd23a73ac5694120d9df0bcef 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -30,6 +30,7 @@
#include "content/browser/media/android/media_resource_getter_impl.h"
#include "content/browser/power_save_blocker_android.h"
#include "content/browser/renderer_host/ime_adapter_android.h"
+#include "content/browser/renderer_host/input/fling/fling_curve_impl_android.h"
#include "content/browser/renderer_host/java/java_bound_object.h"
#include "content/browser/speech/speech_recognizer_impl_android.h"
@@ -52,6 +53,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
{"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
{"DownloadControllerAndroidImpl",
content::DownloadControllerAndroidImpl::RegisterDownloadController},
+ {"FlingCurveImplAndroid", content::FlingCurveImplAndroid::RegisterJni},
{"InterstitialPageDelegateAndroid",
content::InterstitialPageDelegateAndroid::
RegisterInterstitialPageDelegateAndroid},
@@ -68,7 +70,8 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
{"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
{"VibrationMessageFilter", content::VibrationMessageFilter::Register},
{"WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid},
- {"WebViewStatics", content::RegisterWebViewStatics}, };
+ {"WebViewStatics", content::RegisterWebViewStatics},
+ };
} // namespace
« 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