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

Side by Side Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Issue 54863002: Implement a salt for MediaSource IDs that can be cleared by a user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed jois nit. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/browser/renderer_host/media/media_stream_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
6 6
7 #include "content/browser/browser_main_loop.h" 7 #include "content/browser/browser_main_loop.h"
8 #include "content/browser/renderer_host/media/web_contents_capture_util.h" 8 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
9 #include "content/common/media/media_stream_messages.h" 9 #include "content/common/media/media_stream_messages.h"
10 #include "content/common/media/media_stream_options.h" 10 #include "content/common/media/media_stream_options.h"
11 #include "url/gurl.h" 11 #include "url/gurl.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 MediaStreamDispatcherHost::MediaStreamDispatcherHost( 15 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
16 int render_process_id, 16 int render_process_id,
17 ResourceContext* resource_context,
17 MediaStreamManager* media_stream_manager) 18 MediaStreamManager* media_stream_manager)
18 : render_process_id_(render_process_id), 19 : render_process_id_(render_process_id),
20 resource_context_(resource_context),
19 media_stream_manager_(media_stream_manager) { 21 media_stream_manager_(media_stream_manager) {
20 } 22 }
21 23
22 void MediaStreamDispatcherHost::StreamGenerated( 24 void MediaStreamDispatcherHost::StreamGenerated(
23 const std::string& label, 25 const std::string& label,
24 const StreamDeviceInfoArray& audio_devices, 26 const StreamDeviceInfoArray& audio_devices,
25 const StreamDeviceInfoArray& video_devices) { 27 const StreamDeviceInfoArray& video_devices) {
26 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 28 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
27 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated(" 29 DVLOG(1) << "MediaStreamDispatcherHost::StreamGenerated("
28 << ", {label = " << label << "})"; 30 << ", {label = " << label << "})";
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 const GURL& security_origin) { 140 const GURL& security_origin) {
139 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream(" 141 DVLOG(1) << "MediaStreamDispatcherHost::OnGenerateStream("
140 << render_view_id << ", " 142 << render_view_id << ", "
141 << page_request_id << ", [" 143 << page_request_id << ", ["
142 << " audio:" << components.audio_type 144 << " audio:" << components.audio_type
143 << " video:" << components.video_type 145 << " video:" << components.video_type
144 << " ], " 146 << " ], "
145 << security_origin.spec() << ")"; 147 << security_origin.spec() << ")";
146 148
147 const std::string& label = media_stream_manager_->GenerateStream( 149 const std::string& label = media_stream_manager_->GenerateStream(
148 this, render_process_id_, render_view_id, page_request_id, 150 this, render_process_id_, render_view_id, resource_context_,
151 page_request_id,
149 components, security_origin); 152 components, security_origin);
150 CHECK(!label.empty()); 153 CHECK(!label.empty());
151 StoreRequest(render_view_id, page_request_id, label); 154 StoreRequest(render_view_id, page_request_id, label);
152 } 155 }
153 156
154 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, 157 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
155 int page_request_id) { 158 int page_request_id) {
156 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" 159 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
157 << render_view_id << ", " 160 << render_view_id << ", "
158 << page_request_id << ")"; 161 << page_request_id << ")";
(...skipping 24 matching lines...) Expand all
183 int page_request_id, 186 int page_request_id,
184 MediaStreamType type, 187 MediaStreamType type,
185 const GURL& security_origin) { 188 const GURL& security_origin) {
186 DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices(" 189 DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
187 << render_view_id << ", " 190 << render_view_id << ", "
188 << page_request_id << ", " 191 << page_request_id << ", "
189 << type << ", " 192 << type << ", "
190 << security_origin.spec() << ")"; 193 << security_origin.spec() << ")";
191 194
192 const std::string& label = media_stream_manager_->EnumerateDevices( 195 const std::string& label = media_stream_manager_->EnumerateDevices(
193 this, render_process_id_, render_view_id, page_request_id, 196 this, render_process_id_, render_view_id, resource_context_,
194 type, security_origin); 197 page_request_id, type, security_origin);
195 StoreRequest(render_view_id, page_request_id, label); 198 StoreRequest(render_view_id, page_request_id, label);
196 } 199 }
197 200
198 void MediaStreamDispatcherHost::OnCancelEnumerateDevices( 201 void MediaStreamDispatcherHost::OnCancelEnumerateDevices(
199 int render_view_id, 202 int render_view_id,
200 const std::string& label) { 203 const std::string& label) {
201 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices(" 204 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices("
202 << render_view_id << ", " 205 << render_view_id << ", "
203 << label << ")"; 206 << label << ")";
204 207
(...skipping 15 matching lines...) Expand all
220 MediaStreamType type, 223 MediaStreamType type,
221 const GURL& security_origin) { 224 const GURL& security_origin) {
222 DVLOG(1) << "MediaStreamDispatcherHost::OnOpenDevice(" 225 DVLOG(1) << "MediaStreamDispatcherHost::OnOpenDevice("
223 << render_view_id << ", " 226 << render_view_id << ", "
224 << page_request_id << ", device_id: " 227 << page_request_id << ", device_id: "
225 << device_id.c_str() << ", type: " 228 << device_id.c_str() << ", type: "
226 << type << ", " 229 << type << ", "
227 << security_origin.spec() << ")"; 230 << security_origin.spec() << ")";
228 231
229 const std::string& label = media_stream_manager_->OpenDevice( 232 const std::string& label = media_stream_manager_->OpenDevice(
230 this, render_process_id_, render_view_id, page_request_id, 233 this, render_process_id_, render_view_id, resource_context_,
231 device_id, type, security_origin); 234 page_request_id, device_id, type, security_origin);
232 StoreRequest(render_view_id, page_request_id, label); 235 StoreRequest(render_view_id, page_request_id, label);
233 } 236 }
234 237
235 void MediaStreamDispatcherHost::OnCloseDevice( 238 void MediaStreamDispatcherHost::OnCloseDevice(
236 int render_view_id, 239 int render_view_id,
237 const std::string& label) { 240 const std::string& label) {
238 DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice(" 241 DVLOG(1) << "MediaStreamDispatcherHost::OnCloseDevice("
239 << render_view_id << ", " 242 << render_view_id << ", "
240 << label << ")"; 243 << label << ")";
241 244
(...skipping 12 matching lines...) Expand all
254 MediaStreamDispatcherHost::StreamRequest 257 MediaStreamDispatcherHost::StreamRequest
255 MediaStreamDispatcherHost::PopRequest(const std::string& label) { 258 MediaStreamDispatcherHost::PopRequest(const std::string& label) {
256 StreamMap::iterator it = streams_.find(label); 259 StreamMap::iterator it = streams_.find(label);
257 CHECK(it != streams_.end()); 260 CHECK(it != streams_.end());
258 StreamRequest request = it->second; 261 StreamRequest request = it->second;
259 streams_.erase(it); 262 streams_.erase(it);
260 return request; 263 return request;
261 } 264 }
262 265
263 } // namespace content 266 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698