summaryrefslogtreecommitdiffstats
path: root/content/app/android/library_loader_hooks.cc
diff options
context:
space:
mode:
authorpliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 13:35:05 +0000
committerpliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 13:35:05 +0000
commitd272c4c5a4b28fc92798fe13cdf398fd6a9050ab (patch)
tree839da72e2ff069a52cd0252ee9e28198904085e8 /content/app/android/library_loader_hooks.cc
parent267be9fbc2dc337e37bc15baa6b3bedda4239e14 (diff)
downloadchromium_src-d272c4c5a4b28fc92798fe13cdf398fd6a9050ab.zip
chromium_src-d272c4c5a4b28fc92798fe13cdf398fd6a9050ab.tar.gz
chromium_src-d272c4c5a4b28fc92798fe13cdf398fd6a9050ab.tar.bz2
Annotate some Java classes with @JNINamespace("content").
This lets us make the JNI free functions part of the content namespace (while keeping them 'static'). Review URL: https://chromiumcodereview.appspot.com/10696049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/android/library_loader_hooks.cc')
-rw-r--r--content/app/android/library_loader_hooks.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 2287a19..0661fe1 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -30,8 +30,10 @@ namespace {
base::AtExitManager* g_at_exit_manager = NULL;
}
-jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
- jobjectArray init_command_line) {
+namespace content {
+
+static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
+ jobjectArray init_command_line) {
InitNativeCommandLineFromJavaArray(env, init_command_line);
CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -78,8 +80,6 @@ jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
return JNI_TRUE;
}
-namespace content {
-
void LibraryLoaderExitHook() {
if (g_at_exit_manager) {
delete g_at_exit_manager;