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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 1873293002: Report if video capturing meets output protection requirement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed oshima and nasko's comments, and rebased. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index 98d6704583cd3856b282dbbcd5f70ae4aa0b177c..adea25bdd4b46b61af1a074afcb9b3539b530cd7 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -66,9 +66,9 @@ const content::MediaStreamDevice* FindDeviceWithId(
}
#if defined(ENABLE_EXTENSIONS)
-inline DesktopCaptureAccessHandler* ToDesktopCaptureAccessHandler(
+inline CaptureAccessHandlerBase* ToCaptureAccessHandlerBase(
MediaAccessHandler* handler) {
- return static_cast<DesktopCaptureAccessHandler*>(handler);
+ return static_cast<CaptureAccessHandlerBase*>(handler);
}
#endif
} // namespace
@@ -373,13 +373,19 @@ void MediaCaptureDevicesDispatcher::OnCreatingAudioStreamOnUIThread(
OnCreatingAudioStream(render_process_id, render_frame_id));
}
-bool MediaCaptureDevicesDispatcher::IsDesktopCaptureInProgress() {
+bool MediaCaptureDevicesDispatcher::IsInsecureCapturingInProgress(
+ int render_process_id,
+ int render_frame_id) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if defined(ENABLE_EXTENSIONS)
for (MediaAccessHandler* handler : media_access_handlers_) {
if (handler->SupportsStreamType(content::MEDIA_DESKTOP_VIDEO_CAPTURE,
- NULL)) {
- return ToDesktopCaptureAccessHandler(handler)->IsCaptureInProgress();
+ nullptr) ||
+ handler->SupportsStreamType(content::MEDIA_TAB_VIDEO_CAPTURE,
+ nullptr)) {
+ if (ToCaptureAccessHandlerBase(handler)->IsInsecureCapturingInProgress(
+ render_process_id, render_frame_id))
+ return true;
}
}
#endif
@@ -395,3 +401,43 @@ void MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices(
const MediaStreamDevices& devices) {
test_video_devices_ = devices;
}
+
+void MediaCaptureDevicesDispatcher::OnSetCapturingLinkSecured(
+ int render_process_id,
+ int render_frame_id,
+ int page_request_id,
+ content::MediaStreamType stream_type,
+ bool is_secure) {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ if (stream_type != content::MEDIA_TAB_VIDEO_CAPTURE &&
+ stream_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE)
+ return;
+
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ base::Bind(&MediaCaptureDevicesDispatcher::UpdateCapturingLinkSecured,
+ base::Unretained(this), render_process_id, render_frame_id,
+ page_request_id, stream_type, is_secure));
+}
+
+void MediaCaptureDevicesDispatcher::UpdateCapturingLinkSecured(
+ int render_process_id,
+ int render_frame_id,
+ int page_request_id,
+ content::MediaStreamType stream_type,
+ bool is_secure) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ if (stream_type != content::MEDIA_TAB_VIDEO_CAPTURE &&
+ stream_type != content::MEDIA_DESKTOP_VIDEO_CAPTURE)
+ return;
+
+#if defined(ENABLE_EXTENSIONS)
+ for (MediaAccessHandler* handler : media_access_handlers_) {
+ if (handler->SupportsStreamType(stream_type, nullptr)) {
+ ToCaptureAccessHandlerBase(handler)->UpdateCapturingLinkSecured(
+ render_process_id, render_frame_id, page_request_id, is_secure);
+ break;
+ }
+ }
+#endif
+}
« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.h ('k') | chrome/browser/media/tab_capture_access_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698