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

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 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 | « chrome/chrome_tests_unit.gypi ('k') | content/child/android/child_jni_registrar.h » ('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 (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"
11 #include "base/at_exit.h" 11 #include "base/at_exit.h"
12 #include "base/base_switches.h" 12 #include "base/base_switches.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/debug/trace_event.h" 14 #include "base/debug/trace_event.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/tracked_objects.h" 18 #include "base/tracked_objects.h"
19 #include "content/app/android/app_jni_registrar.h" 19 #include "content/app/android/app_jni_registrar.h"
20 #include "content/browser/android/browser_jni_registrar.h" 20 #include "content/browser/android/browser_jni_registrar.h"
21 #include "content/child/android/child_jni_registrar.h"
21 #include "content/common/android/command_line.h" 22 #include "content/common/android/command_line.h"
22 #include "content/common/android/common_jni_registrar.h" 23 #include "content/common/android/common_jni_registrar.h"
23 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
24 #include "content/public/common/result_codes.h" 25 #include "content/public/common/result_codes.h"
25 #include "jni/LibraryLoader_jni.h" 26 #include "jni/LibraryLoader_jni.h"
26 #include "media/base/android/media_jni_registrar.h" 27 #include "media/base/android/media_jni_registrar.h"
27 #include "net/android/net_jni_registrar.h" 28 #include "net/android/net_jni_registrar.h"
28 #include "ui/android/ui_jni_registrar.h" 29 #include "ui/android/ui_jni_registrar.h"
29 #include "ui/gl/android/gl_jni_registrar.h" 30 #include "ui/gl/android/gl_jni_registrar.h"
30 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 31 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 80
80 if (!ui::android::RegisterJni(env)) 81 if (!ui::android::RegisterJni(env))
81 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 82 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
82 83
83 if (!ui::gl::android::RegisterJni(env)) 84 if (!ui::gl::android::RegisterJni(env))
84 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 85 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
85 86
86 if (!ui::shell_dialogs::RegisterJni(env)) 87 if (!ui::shell_dialogs::RegisterJni(env))
87 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 88 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
88 89
90 if (!content::android::RegisterChildJni(env))
91 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
92
89 if (!content::android::RegisterCommonJni(env)) 93 if (!content::android::RegisterCommonJni(env))
90 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 94 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
91 95
92 if (!content::android::RegisterBrowserJni(env)) 96 if (!content::android::RegisterBrowserJni(env))
93 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 97 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
94 98
95 if (!content::android::RegisterAppJni(env)) 99 if (!content::android::RegisterAppJni(env))
96 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 100 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
97 101
98 if (!media::RegisterJni(env)) 102 if (!media::RegisterJni(env))
(...skipping 10 matching lines...) Expand all
109 } 113 }
110 114
111 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 115 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
112 // We need the AtExitManager to be created at the very beginning. 116 // We need the AtExitManager to be created at the very beginning.
113 g_at_exit_manager = new base::AtExitManager(); 117 g_at_exit_manager = new base::AtExitManager();
114 118
115 return RegisterNativesImpl(env); 119 return RegisterNativesImpl(env);
116 } 120 }
117 121
118 } // namespace content 122 } // namespace content
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/child/android/child_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698