| Index: content/public/common/media_stream_request.cc
|
| diff --git a/content/public/common/media_stream_request.cc b/content/public/common/media_stream_request.cc
|
| index 9725335a60f85cb6605a500acabfc916c55fccdc..a79cbd811cb179c93e2d5e8b640ee268069a5e28 100644
|
| --- a/content/public/common/media_stream_request.cc
|
| +++ b/content/public/common/media_stream_request.cc
|
| @@ -126,7 +126,8 @@ MediaStreamRequest::MediaStreamRequest(
|
| const std::string& requested_audio_device_id,
|
| const std::string& requested_video_device_id,
|
| MediaStreamType audio_type,
|
| - MediaStreamType video_type)
|
| + MediaStreamType video_type,
|
| + bool disable_local_echo)
|
| : render_process_id(render_process_id),
|
| render_frame_id(render_frame_id),
|
| page_request_id(page_request_id),
|
| @@ -137,8 +138,8 @@ MediaStreamRequest::MediaStreamRequest(
|
| requested_video_device_id(requested_video_device_id),
|
| audio_type(audio_type),
|
| video_type(video_type),
|
| - all_ancestors_have_same_origin(false) {
|
| -}
|
| + disable_local_echo(disable_local_echo),
|
| + all_ancestors_have_same_origin(false) {}
|
|
|
| MediaStreamRequest::MediaStreamRequest(const MediaStreamRequest& other) =
|
| default;
|
|
|