OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/public/common/media_stream_request.h" | 5 #include "content/public/common/media_stream_request.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 id == second.id && | 65 id == second.id && |
66 input.sample_rate == input_second.sample_rate && | 66 input.sample_rate == input_second.sample_rate && |
67 input.channel_layout == input_second.channel_layout; | 67 input.channel_layout == input_second.channel_layout; |
68 } | 68 } |
69 | 69 |
70 MediaStreamRequest::MediaStreamRequest( | 70 MediaStreamRequest::MediaStreamRequest( |
71 int render_process_id, | 71 int render_process_id, |
72 int render_view_id, | 72 int render_view_id, |
73 int page_request_id, | 73 int page_request_id, |
74 const GURL& security_origin, | 74 const GURL& security_origin, |
| 75 bool user_gesture, |
75 MediaStreamRequestType request_type, | 76 MediaStreamRequestType request_type, |
76 const std::string& requested_audio_device_id, | 77 const std::string& requested_audio_device_id, |
77 const std::string& requested_video_device_id, | 78 const std::string& requested_video_device_id, |
78 MediaStreamType audio_type, | 79 MediaStreamType audio_type, |
79 MediaStreamType video_type) | 80 MediaStreamType video_type) |
80 : render_process_id(render_process_id), | 81 : render_process_id(render_process_id), |
81 render_view_id(render_view_id), | 82 render_view_id(render_view_id), |
82 page_request_id(page_request_id), | 83 page_request_id(page_request_id), |
83 security_origin(security_origin), | 84 security_origin(security_origin), |
| 85 user_gesture(user_gesture), |
84 request_type(request_type), | 86 request_type(request_type), |
85 requested_audio_device_id(requested_audio_device_id), | 87 requested_audio_device_id(requested_audio_device_id), |
86 requested_video_device_id(requested_video_device_id), | 88 requested_video_device_id(requested_video_device_id), |
87 audio_type(audio_type), | 89 audio_type(audio_type), |
88 video_type(video_type) { | 90 video_type(video_type) { |
89 } | 91 } |
90 | 92 |
91 MediaStreamRequest::~MediaStreamRequest() {} | 93 MediaStreamRequest::~MediaStreamRequest() {} |
92 | 94 |
93 } // namespace content | 95 } // namespace content |
OLD | NEW |