| Index: content/child/android/child_jni_registrar.cc
|
| diff --git a/content/app/android/app_jni_registrar.cc b/content/child/android/child_jni_registrar.cc
|
| similarity index 57%
|
| copy from content/app/android/app_jni_registrar.cc
|
| copy to content/child/android/child_jni_registrar.cc
|
| index 55585f2dee814e17ffa9e213dbd9441ada41be32..ffcc8d2624e6963d519b1c5c235eead718e7f286 100644
|
| --- a/content/app/android/app_jni_registrar.cc
|
| +++ b/content/child/android/child_jni_registrar.cc
|
| @@ -1,19 +1,16 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/app/android/app_jni_registrar.h"
|
| +#include "content/child/android/child_jni_registrar.h"
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| -#include "content/app/android/child_process_service.h"
|
| -#include "content/app/android/content_main.h"
|
| +#include "webkit/child/fling_animator_impl_android.h"
|
|
|
| namespace {
|
| -
|
| base::android::RegistrationMethod kContentRegisteredMethods[] = {
|
| - { "ContentMain", content::RegisterContentMain },
|
| - { "ChildProcessService", content::RegisterChildProcessService },
|
| + { "FlingAnimator", webkit_glue::FlingAnimatorImpl::RegisterJni },
|
| };
|
|
|
| } // namespace
|
| @@ -21,7 +18,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
|
| namespace content {
|
| namespace android {
|
|
|
| -bool RegisterAppJni(JNIEnv* env) {
|
| +bool RegisterChildJni(JNIEnv* env) {
|
| return RegisterNativeMethods(env, kContentRegisteredMethods,
|
| arraysize(kContentRegisteredMethods));
|
| }
|
|
|