Chromium Code Reviews| 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..88f43f859d75209e5234030b970e45d633176717 100644 |
| --- a/chrome/browser/media/media_capture_devices_dispatcher.h |
| +++ b/chrome/browser/media/media_capture_devices_dispatcher.h |
| @@ -137,13 +137,27 @@ 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 capturing is in process, and return if it is secure in |
| + // |is_link_secure|. The capturing is secure if all video sinks are reported |
| + // secure and the extension is white listed for casting. |
|
miu
2016/04/16 00:05:29
s/extension is white listed for casting/extension
xjz
2016/04/21 23:50:45
Done.
|
| + bool IsCaptureInProgress(int render_process_id, |
| + int render_frame_id, |
| + bool* is_link_secure); |
|
miu
2016/04/16 00:05:29
Can you eliminate the 3rd argument, and just retur
xjz
2016/04/21 23:50:45
Done. Initially I thought we need to report if cap
|
| + |
| // Only for testing. |
| void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices); |
| void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices); |
| @@ -166,6 +180,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_; |