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

Unified Diff: content/public/common/media_stream_request.h

Issue 11446042: Make sure that all OpenDevice requests are scrutinized against the audio and video policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved RequestType according to Shijing's proposal. Created 8 years 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: 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().

Powered by Google App Engine
This is Rietveld 408576698