Index: chrome/browser/media/desktop_capture_access_handler.h |
diff --git a/chrome/browser/media/desktop_capture_access_handler.h b/chrome/browser/media/desktop_capture_access_handler.h |
index c0ab0ec3ac6dbcea3852a9a4d95fca7596964865..39906d171c4bf046f412b841eba494f3dc6ed076 100644 |
--- a/chrome/browser/media/desktop_capture_access_handler.h |
+++ b/chrome/browser/media/desktop_capture_access_handler.h |
@@ -35,8 +35,18 @@ class DesktopCaptureAccessHandler : public MediaAccessHandler { |
content::MediaStreamType stream_type, |
content::MediaRequestState state) override; |
+ // TODO(xjz): To be removed. |
miu
2016/04/16 00:05:29
crbug link?
xjz
2016/04/21 23:50:44
Do we need a crbug for this one? It will be remove
miu
2016/04/26 01:25:13
That's fine, if you know this will happen soon.
|
bool IsCaptureInProgress(); |
+ bool IsCaptureInProgress(int render_process_id, |
miu
2016/04/16 00:05:29
Seems like these two new methods should be in the
xjz
2016/04/21 23:50:44
Done. Moved them to the new CaptureAccessHandlerBa
|
+ int render_frame_id, |
+ bool* is_link_secure); |
+ void UpdateCapturingLinkSecured(int render_process_id, |
+ int render_frame_id, |
+ int page_request_id, |
+ content::MediaStreamType stream_type, |
+ bool is_secure); |
+ |
private: |
// Tracks MEDIA_DESKTOP_VIDEO_CAPTURE sessions which reach the |
// MEDIA_REQUEST_STATE_DONE state. Sessions are remove when |
@@ -45,6 +55,7 @@ class DesktopCaptureAccessHandler : public MediaAccessHandler { |
int render_process_id; |
int render_frame_id; |
int page_request_id; |
+ bool is_capturing_link_secure; |
}; |
typedef std::list<DesktopCaptureSession> DesktopCaptureSessions; |
@@ -55,6 +66,9 @@ class DesktopCaptureAccessHandler : public MediaAccessHandler { |
const extensions::Extension* extension); |
DesktopCaptureSessions desktop_capture_sessions_; |
+ |
+ // If the extension is authorized for casting. |
miu
2016/04/16 00:05:29
nit: Let's expand a bit on this comment here. How
xjz
2016/04/21 23:50:44
Moved it into the |session| structure, as it shoul
|
+ bool extension_whitelisted_; |
miu
2016/04/16 00:05:29
naming nit (for accuracy): How about: trusted_exte
xjz
2016/04/21 23:50:44
Moved it into the |Session| structure.
|
}; |
#endif // CHROME_BROWSER_MEDIA_DESKTOP_CAPTURE_ACCESS_HANDLER_H_ |