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

Unified Diff: content/child/android/child_jni_registrar.cc

Issue 16424008: move webkit/glue/fling_* to webkit/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android 5 Created 7 years, 6 months 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 | « content/child/android/child_jni_registrar.h ('k') | content/common/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
« no previous file with comments | « content/child/android/child_jni_registrar.h ('k') | content/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698