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

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

Issue 1417173008: Move MotionEventAndroid to ui/events/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Copyright date fix. Created 5 years, 1 month 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
« no previous file with comments | « build/jar_file_jni_generator.gypi ('k') | content/browser/android/browser_jni_registrar.cc » ('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/app/android/library_loader_hooks.h" 5 #include "content/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/command_line_android.h" 8 #include "base/android/command_line_android.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_registrar.h" 10 #include "base/android/jni_registrar.h"
(...skipping 12 matching lines...) Expand all
23 #include "content/common/android/common_jni_registrar.h" 23 #include "content/common/android/common_jni_registrar.h"
24 #include "content/common/content_constants_internal.h" 24 #include "content/common/content_constants_internal.h"
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/common/result_codes.h" 26 #include "content/public/common/result_codes.h"
27 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 27 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
28 #include "media/base/android/media_jni_registrar.h" 28 #include "media/base/android/media_jni_registrar.h"
29 #include "media/midi/midi_jni_registrar.h" 29 #include "media/midi/midi_jni_registrar.h"
30 #include "net/android/net_jni_registrar.h" 30 #include "net/android/net_jni_registrar.h"
31 #include "ui/android/ui_android_jni_registrar.h" 31 #include "ui/android/ui_android_jni_registrar.h"
32 #include "ui/base/android/ui_base_jni_registrar.h" 32 #include "ui/base/android/ui_base_jni_registrar.h"
33 #include "ui/events/android/events_jni_registrar.h"
33 #include "ui/gfx/android/gfx_jni_registrar.h" 34 #include "ui/gfx/android/gfx_jni_registrar.h"
34 #include "ui/gl/android/gl_jni_registrar.h" 35 #include "ui/gl/android/gl_jni_registrar.h"
35 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 36 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
36 37
37 namespace content { 38 namespace content {
38 39
39 bool EnsureJniRegistered(JNIEnv* env) { 40 bool EnsureJniRegistered(JNIEnv* env) {
40 static bool g_jni_init_done = false; 41 static bool g_jni_init_done = false;
41 42
42 if (!g_jni_init_done) { 43 if (!g_jni_init_done) {
43 if (!base::android::RegisterJni(env)) 44 if (!base::android::RegisterJni(env))
44 return false; 45 return false;
45 46
46 if (!gfx::android::RegisterJni(env)) 47 if (!gfx::android::RegisterJni(env))
47 return false; 48 return false;
48 49
49 if (!net::android::RegisterJni(env)) 50 if (!net::android::RegisterJni(env))
50 return false; 51 return false;
51 52
52 if (!ui::android::RegisterJni(env)) 53 if (!ui::android::RegisterJni(env))
53 return false; 54 return false;
54 55
55 if (!ui::gl::android::RegisterJni(env)) 56 if (!ui::gl::android::RegisterJni(env))
56 return false; 57 return false;
57 58
59 if (!ui::events::android::RegisterJni(env))
60 return false;
61
58 if (!ui::shell_dialogs::RegisterJni(env)) 62 if (!ui::shell_dialogs::RegisterJni(env))
59 return false; 63 return false;
60 64
61 if (!content::android::RegisterCommonJni(env)) 65 if (!content::android::RegisterCommonJni(env))
62 return false; 66 return false;
63 67
64 if (!content::android::RegisterBrowserJni(env)) 68 if (!content::android::RegisterBrowserJni(env))
65 return false; 69 return false;
66 70
67 if (!content::android::RegisterAppJni(env)) 71 if (!content::android::RegisterAppJni(env))
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 false, // Thread ID 122 false, // Thread ID
119 false, // Timestamp 123 false, // Timestamp
120 false); // Tick count 124 false); // Tick count
121 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 125 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
122 << ", default verbosity = " << logging::GetVlogVerbosity(); 126 << ", default verbosity = " << logging::GetVlogVerbosity();
123 127
124 return true; 128 return true;
125 } 129 }
126 130
127 } // namespace content 131 } // namespace content
OLDNEW
« no previous file with comments | « build/jar_file_jni_generator.gypi ('k') | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698