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

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

Issue 2125973002: Reland: ScreenCapture for Android phase1, part I (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add dependency to mojo/interfaces:image_capture Created 4 years, 5 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | content/browser/media/capture/screen_capture_device_android.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/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 11 matching lines...) Expand all
22 #include "content/app/android/app_jni_registrar.h" 22 #include "content/app/android/app_jni_registrar.h"
23 #include "content/browser/android/browser_jni_registrar.h" 23 #include "content/browser/android/browser_jni_registrar.h"
24 #include "content/common/android/common_jni_registrar.h" 24 #include "content/common/android/common_jni_registrar.h"
25 #include "content/common/content_constants_internal.h" 25 #include "content/common/content_constants_internal.h"
26 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
27 #include "content/public/common/result_codes.h" 27 #include "content/public/common/result_codes.h"
28 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 28 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
29 #include "device/power_save_blocker/power_save_blocker_jni_registrar.h" 29 #include "device/power_save_blocker/power_save_blocker_jni_registrar.h"
30 #include "device/usb/android/usb_jni_registrar.h" 30 #include "device/usb/android/usb_jni_registrar.h"
31 #include "media/base/android/media_jni_registrar.h" 31 #include "media/base/android/media_jni_registrar.h"
32 #include "media/capture/content/android/screen_capture_jni_registrar.h"
32 #include "media/capture/video/android/capture_jni_registrar.h" 33 #include "media/capture/video/android/capture_jni_registrar.h"
33 #include "media/midi/midi_jni_registrar.h" 34 #include "media/midi/midi_jni_registrar.h"
34 #include "net/android/net_jni_registrar.h" 35 #include "net/android/net_jni_registrar.h"
35 #include "ui/android/ui_android_jni_registrar.h" 36 #include "ui/android/ui_android_jni_registrar.h"
36 #include "ui/base/android/ui_base_jni_registrar.h" 37 #include "ui/base/android/ui_base_jni_registrar.h"
37 #include "ui/events/android/events_jni_registrar.h" 38 #include "ui/events/android/events_jni_registrar.h"
38 #include "ui/gfx/android/gfx_jni_registrar.h" 39 #include "ui/gfx/android/gfx_jni_registrar.h"
39 #include "ui/gl/android/gl_jni_registrar.h" 40 #include "ui/gl/android/gl_jni_registrar.h"
40 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 41 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
41 42
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 87
87 if (!media::RegisterJni(env)) 88 if (!media::RegisterJni(env))
88 return false; 89 return false;
89 90
90 if (!media::RegisterCaptureJni(env)) 91 if (!media::RegisterCaptureJni(env))
91 return false; 92 return false;
92 93
93 if (!media::midi::RegisterJni(env)) 94 if (!media::midi::RegisterJni(env))
94 return false; 95 return false;
95 96
97 if (!media::RegisterScreenCaptureJni(env))
98 return false;
99
96 if (!ui::RegisterUIAndroidJni(env)) 100 if (!ui::RegisterUIAndroidJni(env))
97 return false; 101 return false;
98 102
99 g_jni_init_done = true; 103 g_jni_init_done = true;
100 } 104 }
101 105
102 return true; 106 return true;
103 } 107 }
104 108
105 bool LibraryLoaded(JNIEnv* env, jclass clazz) { 109 bool LibraryLoaded(JNIEnv* env, jclass clazz) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 false, // Thread ID 148 false, // Thread ID
145 false, // Timestamp 149 false, // Timestamp
146 false); // Tick count 150 false); // Tick count
147 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 151 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
148 << ", default verbosity = " << logging::GetVlogVerbosity(); 152 << ", default verbosity = " << logging::GetVlogVerbosity();
149 153
150 return true; 154 return true;
151 } 155 }
152 156
153 } // namespace content 157 } // namespace content
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | content/browser/media/capture/screen_capture_device_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698