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

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

Issue 25015003: gfx: Create a separate gfx component out of ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 2 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 | « components/web_contents_delegate_android.gypi ('k') | content/content_app.gypi » ('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/child/android/child_jni_registrar.h"
22 #include "content/common/android/command_line.h" 22 #include "content/common/android/command_line.h"
23 #include "content/common/android/common_jni_registrar.h" 23 #include "content/common/android/common_jni_registrar.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/common/result_codes.h" 25 #include "content/public/common/result_codes.h"
26 #include "jni/LibraryLoader_jni.h" 26 #include "jni/LibraryLoader_jni.h"
27 #include "media/base/android/media_jni_registrar.h" 27 #include "media/base/android/media_jni_registrar.h"
28 #include "net/android/net_jni_registrar.h" 28 #include "net/android/net_jni_registrar.h"
29 #include "ui/android/ui_jni_registrar.h" 29 #include "ui/android/ui_jni_registrar.h"
30 #include "ui/gfx/android/gfx_jni_registrar.h"
30 #include "ui/gl/android/gl_jni_registrar.h" 31 #include "ui/gl/android/gl_jni_registrar.h"
31 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 32 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
32 33
33 namespace { 34 namespace {
34 base::AtExitManager* g_at_exit_manager = NULL; 35 base::AtExitManager* g_at_exit_manager = NULL;
35 } 36 }
36 37
37 namespace content { 38 namespace content {
38 39
39 static jint LibraryLoaded(JNIEnv* env, jclass clazz, 40 static jint LibraryLoaded(JNIEnv* env, jclass clazz,
(...skipping 26 matching lines...) Expand all
66 logging::SetLogItems(false, // Process ID 67 logging::SetLogItems(false, // Process ID
67 false, // Thread ID 68 false, // Thread ID
68 false, // Timestamp 69 false, // Timestamp
69 false); // Tick count 70 false); // Tick count
70 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 71 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
71 << ", default verbosity = " << logging::GetVlogVerbosity(); 72 << ", default verbosity = " << logging::GetVlogVerbosity();
72 73
73 if (!base::android::RegisterJni(env)) 74 if (!base::android::RegisterJni(env))
74 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 75 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
75 76
77 if (!gfx::android::RegisterJni(env))
78 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
79
76 if (!net::android::RegisterJni(env)) 80 if (!net::android::RegisterJni(env))
77 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 81 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
78 82
79 if (!ui::android::RegisterJni(env)) 83 if (!ui::android::RegisterJni(env))
80 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 84 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
81 85
82 if (!ui::gl::android::RegisterJni(env)) 86 if (!ui::gl::android::RegisterJni(env))
83 return RESULT_CODE_FAILED_TO_REGISTER_JNI; 87 return RESULT_CODE_FAILED_TO_REGISTER_JNI;
84 88
85 if (!ui::shell_dialogs::RegisterJni(env)) 89 if (!ui::shell_dialogs::RegisterJni(env))
(...skipping 25 matching lines...) Expand all
111 } 115 }
112 116
113 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { 117 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
114 // We need the AtExitManager to be created at the very beginning. 118 // We need the AtExitManager to be created at the very beginning.
115 g_at_exit_manager = new base::AtExitManager(); 119 g_at_exit_manager = new base::AtExitManager();
116 120
117 return RegisterNativesImpl(env); 121 return RegisterNativesImpl(env);
118 } 122 }
119 123
120 } // namespace content 124 } // namespace content
OLDNEW
« no previous file with comments | « components/web_contents_delegate_android.gypi ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698