content/app/android/library_loader_hooks.cc - Issue 2416403002: Reland of Android: support multiple displays on C++ side

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

Issue 2416403002: Reland of Android: support multiple displays on C++ side (Closed)

Patch Set: Ensure primary display. New jni scheme Created 4 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:

« no previous file with comments | « blimp/test/run_all_unittests.cc ('k') | content/browser/web_contents/web_contents_view_android.cc » ('j') | ui/android/java/src/org/chromium/ui/display/DisplayAndroid.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 21 matching lines...) Expand all Loading...
32 #include "device/geolocation/android/geolocation_jni_registrar.h"	32 #include "device/geolocation/android/geolocation_jni_registrar.h"

33 #include "device/time_zone_monitor/android/time_zone_monitor_jni_registrar.h"	33 #include "device/time_zone_monitor/android/time_zone_monitor_jni_registrar.h"

34 #include "device/usb/android/usb_jni_registrar.h"	34 #include "device/usb/android/usb_jni_registrar.h"

35 #include "media/base/android/media_jni_registrar.h"	35 #include "media/base/android/media_jni_registrar.h"

36 #include "media/capture/content/android/screen_capture_jni_registrar.h"	36 #include "media/capture/content/android/screen_capture_jni_registrar.h"

37 #include "media/capture/video/android/capture_jni_registrar.h"	37 #include "media/capture/video/android/capture_jni_registrar.h"

38 #include "media/midi/midi_jni_registrar.h"	38 #include "media/midi/midi_jni_registrar.h"

39 #include "net/android/net_jni_registrar.h"	39 #include "net/android/net_jni_registrar.h"

40 #include "ui/android/ui_android_jni_registrar.h"	40 #include "ui/android/ui_android_jni_registrar.h"

41 #include "ui/base/android/ui_base_jni_registrar.h"	41 #include "ui/base/android/ui_base_jni_registrar.h"

	42 #include "ui/display/android/jni_registrar.h"

42 #include "ui/gfx/android/gfx_jni_registrar.h"	43 #include "ui/gfx/android/gfx_jni_registrar.h"

43 #include "ui/gl/android/gl_jni_registrar.h"	44 #include "ui/gl/android/gl_jni_registrar.h"

44 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"	45 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"

45	46

46 namespace content {	47 namespace content {

47	48

48 bool EnsureJniRegistered(JNIEnv* env) {	49 bool EnsureJniRegistered(JNIEnv* env) {

49 static bool g_jni_init_done = false;	50 static bool g_jni_init_done = false;

50	51

51 if (!g_jni_init_done) {	52 if (!g_jni_init_done) {

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
90	91

91 if (!device::android::RegisterSensorsJni(env))	92 if (!device::android::RegisterSensorsJni(env))

92 return false;	93 return false;

93	94

94 if (!device::android::RegisterTimeZoneMonitorJni(env))	95 if (!device::android::RegisterTimeZoneMonitorJni(env))

95 return false;	96 return false;

96	97

97 if (!device::android::RegisterUsbJni(env))	98 if (!device::android::RegisterUsbJni(env))

98 return false;	99 return false;

99	100

	101 if (!display::RegisterJni(env))
	Tima Vaisburd 2016/10/27 07:55:58 Put registration separately from ui::RegisterUIAnd Put registration separately from ui::RegisterUIAndroidJni(): is this the right approach?
	102 return false;

	103

100 if (!media::RegisterJni(env))	104 if (!media::RegisterJni(env))

101 return false;	105 return false;

102	106

103 if (!media::RegisterCaptureJni(env))	107 if (!media::RegisterCaptureJni(env))

104 return false;	108 return false;

105	109

106 if (!media::RegisterScreenCaptureJni(env))	110 if (!media::RegisterScreenCaptureJni(env))

107 return false;	111 return false;

108	112

109 if (!midi::RegisterJni(env))	113 if (!midi::RegisterJni(env))

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 false, // Thread ID	164 false, // Thread ID

161 false, // Timestamp	165 false, // Timestamp

162 false); // Tick count	166 false); // Tick count

163 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()	167 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()

164 << ", default verbosity = " << logging::GetVlogVerbosity();	168 << ", default verbosity = " << logging::GetVlogVerbosity();

165	169

166 return true;	170 return true;

167 }	171 }

168	172

169 } // namespace content	173 } // namespace content

OLD	NEW