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

Side by Side Diff: content/app/android/library_loader_hooks.cc

Issue 16424008: move webkit/glue/fling_* to webkit/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android overscroller jni generation 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/app/android_library_loader_hooks.h" 5 #include "content/public/app/android_library_loader_hooks.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 if (!ui::android::RegisterJni(env)) 80 if (!ui::android::RegisterJni(env))
81 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 81 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
82 82
83 if (!ui::gl::android::RegisterJni(env)) 83 if (!ui::gl::android::RegisterJni(env))
84 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 84 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
85 85
86 if (!ui::shell_dialogs::RegisterJni(env)) 86 if (!ui::shell_dialogs::RegisterJni(env))
87 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 87 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
88 88
89 if (!content::android::RegisterChildJni(env))
90 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
91
89 if (!content::android::RegisterCommonJni(env)) 92 if (!content::android::RegisterCommonJni(env))
90 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 93 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
91 94
92 if (!content::android::RegisterBrowserJni(env)) 95 if (!content::android::RegisterBrowserJni(env))
93 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 96 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
94 97
95 if (!content::android::RegisterAppJni(env)) 98 if (!content::android::RegisterAppJni(env))
96 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 99 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
97 100
98 if (!media::RegisterJni(env)) 101 if (!media::RegisterJni(env))
(...skipping 10 matching lines...) Expand all
109 } 112 }
110 113
111 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 114 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
112 // We need the AtExitManager to be created at the very beginning. 115 // We need the AtExitManager to be created at the very beginning.
113 g_at_exit_manager = new base::AtExitManager(); 116 g_at_exit_manager = new base::AtExitManager();
114 117
115 return RegisterNativesImpl(env); 118 return RegisterNativesImpl(env);
116 } 119 }
117 120
118 } // namespace content 121 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698