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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/child/android/child_jni_registrar.h ('k') | content/common/DEPS » ('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 2013 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/app/android/app_jni_registrar.h" 5 #include "content/child/android/child_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/app/android/child_process_service.h" 9 #include "webkit/child/fling_animator_impl_android.h"
10 #include "content/app/android/content_main.h"
11 10
12 namespace { 11 namespace {
13
14 base::android::RegistrationMethod kContentRegisteredMethods[] = { 12 base::android::RegistrationMethod kContentRegisteredMethods[] = {
15 { "ContentMain", content::RegisterContentMain }, 13 { "FlingAnimator", webkit_glue::FlingAnimatorImpl::RegisterJni },
16 { "ChildProcessService", content::RegisterChildProcessService },
17 }; 14 };
18 15
19 } // namespace 16 } // namespace
20 17
21 namespace content { 18 namespace content {
22 namespace android { 19 namespace android {
23 20
24 bool RegisterAppJni(JNIEnv* env) { 21 bool RegisterChildJni(JNIEnv* env) {
25 return RegisterNativeMethods(env, kContentRegisteredMethods, 22 return RegisterNativeMethods(env, kContentRegisteredMethods,
26 arraysize(kContentRegisteredMethods)); 23 arraysize(kContentRegisteredMethods));
27 } 24 }
28 25
29 } // namespace android 26 } // namespace android
30 } // namespace content 27 } // namespace content
OLDNEW
« 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