Index: content/public/common/media_stream_request.h |
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h |
index ccd868f39ff7e523666bd8a4807d4d933aaf01d6..14bf0ff10a2c2eaf80859b2ef73e2872ed697af0 100644 |
--- a/content/public/common/media_stream_request.h |
+++ b/content/public/common/media_stream_request.h |
@@ -30,6 +30,13 @@ enum MediaStreamDeviceType { |
NUM_MEDIA_TYPES |
}; |
+enum MediaStreamRequestType { |
+ DEVICE_ACCESS = 0, |
no longer working on chromium
2012/12/10 10:17:56
It will be used by multiple files now, how do you
pastarmovj
2012/12/12 09:57:03
Done.
|
+ GENERATE_STREAM, |
+ ENUMERATE_DEVICES, |
+ OPEN_DEVICE |
+}; |
+ |
// Convenience predicates to determine whether the given type represents some |
// audio or some video device. |
CONTENT_EXPORT bool IsAudioMediaType(MediaStreamDeviceType type); |
@@ -65,7 +72,8 @@ struct CONTENT_EXPORT MediaStreamRequest { |
MediaStreamRequest( |
int render_process_id, |
int render_view_id, |
- const GURL& security_origin); |
+ const GURL& security_origin, |
+ MediaStreamRequestType request_type); |
~MediaStreamRequest(); |
@@ -78,6 +86,10 @@ struct CONTENT_EXPORT MediaStreamRequest { |
// The WebKit security origin for the current request (e.g. "html5rocks.com"). |
GURL security_origin; |
+ // Whether the request should be verified against the rules for denial only or |
+ // whether the user should be explicitly asked for permission too. |
+ MediaStreamRequestType request_type; |
+ |
// A list of devices present on the user's computer, for each device type |
// requested. |
// All the elements in this map will be deleted in ~MediaStreamRequest(). |