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

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

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove JNIHelper/BitmapHolder Created 8 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/app/android/content_jni_registrar.cc ('k') | content/browser/android/command_line.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_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.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/command_line.h" 12 #include "base/command_line.h"
13 #include "base/debug/trace_event.h" 13 #include "base/debug/trace_event.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/string_tokenizer.h" 17 #include "base/string_tokenizer.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/tracked_objects.h" 19 #include "base/tracked_objects.h"
20 #include "content/app/android/content_jni_registrar.h" 20 #include "content/app/android/content_jni_registrar.h"
21 #include "content/browser/android/command_line.h" 21 #include "content/common/android/command_line.h"
22 #include "content/public/common/content_switches.h" 22 #include "content/public/common/content_switches.h"
23 #include "media/base/android/media_jni_registrar.h" 23 #include "media/base/android/media_jni_registrar.h"
24 #include "net/android/net_jni_registrar.h" 24 #include "net/android/net_jni_registrar.h"
25 #include "jni/library_loader_jni.h" 25 #include "jni/library_loader_jni.h"
26 26
27 namespace { 27 namespace {
28 base::AtExitManager* g_at_exit_manager = NULL; 28 base::AtExitManager* g_at_exit_manager = NULL;
29 } 29 }
30 30
31 jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, 31 jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 delete g_at_exit_manager; 80 delete g_at_exit_manager;
81 g_at_exit_manager = NULL; 81 g_at_exit_manager = NULL;
82 } 82 }
83 } 83 }
84 84
85 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 85 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
86 return RegisterNativesImpl(env); 86 return RegisterNativesImpl(env);
87 } 87 }
88 88
89 } // namespace content 89 } // namespace content
OLDNEW
« no previous file with comments | « content/app/android/content_jni_registrar.cc ('k') | content/browser/android/command_line.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698