Index: chrome/browser/media/media_capture_devices_dispatcher.h |
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.h b/chrome/browser/media/media_capture_devices_dispatcher.h |
index 306025aafe04e72a6a5068a2994a18e25be86745..6d2bcd8bcec8a97473d2cb737574ae5a8740a441 100644 |
--- a/chrome/browser/media/media_capture_devices_dispatcher.h |
+++ b/chrome/browser/media/media_capture_devices_dispatcher.h |
@@ -137,13 +137,26 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver { |
content::MediaRequestState state) override; |
void OnCreatingAudioStream(int render_process_id, |
int render_frame_id) override; |
+ void OnSetCapturingLinkSecured(int render_process_id, |
+ int render_frame_id, |
+ int page_request_id, |
+ content::MediaStreamType stream_type, |
+ bool is_secure) override; |
scoped_refptr<MediaStreamCaptureIndicator> GetMediaStreamCaptureIndicator(); |
DesktopStreamsRegistry* GetDesktopStreamsRegistry(); |
+ // TODO(xjz): remove this after output protection changes to use |
+ // |IsCaptureInProgress()| for checking. |
bool IsDesktopCaptureInProgress(); |
+ // Check if any capture is in process, and return if it has secure link in |
+ // |is_link_secure|. |
xhwang
2016/04/12 22:18:50
We are more interested in whether all links are se
xjz
2016/04/12 22:29:08
Yes. |is_link_secure| is true only when all links
|
+ bool IsCaptureInProgress(int render_process_id, |
+ int render_frame_id, |
+ bool* is_link_secure); |
xhwang
2016/04/12 22:18:49
Does this cover all capturing cases, e.g. desktop/
xjz
2016/04/12 22:29:07
Yes.
|
+ |
// Only for testing. |
void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices); |
void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices); |
@@ -166,6 +179,11 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver { |
content::MediaRequestState state); |
void OnCreatingAudioStreamOnUIThread(int render_process_id, |
int render_frame_id); |
+ void UpdateCapturingLinkSecured(int render_process_id, |
+ int render_frame_id, |
+ int page_request_id, |
+ content::MediaStreamType stream_type, |
+ bool is_secure); |
// Only for testing, a list of cached audio capture devices. |
content::MediaStreamDevices test_audio_devices_; |