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

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

Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 2 months 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 71188adde5ccb7038d26f07f5b43f25b23967b66..2af33576169f900c770e109cfda2fbf7af1bc251 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -204,17 +204,17 @@ typedef std::map<MediaStreamType, MediaStreamDevices> MediaStreamDeviceMap;
// Tab-only stuff and Pepper-only stuff being passed around to all clients,
// which is icky.
struct CONTENT_EXPORT MediaStreamRequest {
- MediaStreamRequest(
- int render_process_id,
- int render_frame_id,
- int page_request_id,
- const GURL& security_origin,
- bool user_gesture,
- MediaStreamRequestType request_type,
- const std::string& requested_audio_device_id,
- const std::string& requested_video_device_id,
- MediaStreamType audio_type,
- MediaStreamType video_type);
+ MediaStreamRequest(int render_process_id,
+ int render_frame_id,
+ int page_request_id,
+ const GURL& security_origin,
+ bool user_gesture,
+ MediaStreamRequestType request_type,
+ const std::string& requested_audio_device_id,
+ const std::string& requested_video_device_id,
+ MediaStreamType audio_type,
+ MediaStreamType video_type,
+ bool disable_local_echo);
MediaStreamRequest(const MediaStreamRequest& other);
@@ -256,6 +256,10 @@ struct CONTENT_EXPORT MediaStreamRequest {
// Flag to indicate if the request contains video.
MediaStreamType video_type;
+ // Flag for desktop or tab share to indicate whether to prevent the captured
+ // audio being played out locally.
+ bool disable_local_echo;
+
// True if all ancestors of the requesting frame have the same origin.
bool all_ancestors_have_same_origin;
};
« no previous file with comments | « content/public/browser/web_contents_media_capture_id.cc ('k') | content/public/common/media_stream_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698