summaryrefslogtreecommitdiffstats
path: root/content/common/android
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 20:02:21 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 20:02:21 +0000
commitb52a42243daf55ec35be02f382e6873aeb9a3992 (patch)
tree18f5937da732ff2b91c9d52b25d632c4ebea13b9 /content/common/android
parent9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4 (diff)
downloadchromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.zip
chromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.tar.gz
chromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.tar.bz2
move webkit/glue/fling_* to webkit/child
A little bit of rejiggering for Android JNI registration. R=jam@chromium.org, jamesr@chromium.org BUG=237249 Review URL: https://codereview.chromium.org/16424008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/android')
-rw-r--r--content/common/android/common_jni_registrar.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/common/android/common_jni_registrar.cc b/content/common/android/common_jni_registrar.cc
index fd7f2a6..ead0cfe 100644
--- a/content/common/android/common_jni_registrar.cc
+++ b/content/common/android/common_jni_registrar.cc
@@ -10,14 +10,12 @@
#include "content/common/android/device_telephony_info.h"
#include "content/common/android/hash_set.h"
#include "content/common/android/trace_event_binding.h"
-#include "webkit/glue/fling_animator_impl_android.h"
namespace {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
{ "CommandLine", RegisterCommandLine },
{ "DeviceTelephonyInfo",
content::DeviceTelephonyInfo::RegisterDeviceTelephonyInfo },
- { "FlingAnimator", webkit_glue::FlingAnimatorImpl::RegisterJni },
{ "HashSet", content::RegisterHashSet },
{ "TraceEvent", RegisterTraceEvent },
};