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

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

Issue 10534004: Implement CancelUserMediaRequest for the browser part (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: addressed tommi's comments Created 8 years, 6 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 unified diff | Download patch
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/common/media/media_stream_messages.h" 7 #include "content/common/media/media_stream_messages.h"
8 #include "content/common/media/media_stream_options.h" 8 #include "content/common/media/media_stream_options.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 10
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 components, security_origin, &label); 207 components, security_origin, &label);
208 DCHECK(!label.empty()); 208 DCHECK(!label.empty());
209 streams_[label] = StreamRequest(render_view_id, page_request_id); 209 streams_[label] = StreamRequest(render_view_id, page_request_id);
210 } 210 }
211 211
212 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id, 212 void MediaStreamDispatcherHost::OnCancelGenerateStream(int render_view_id,
213 int page_request_id) { 213 int page_request_id) {
214 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream(" 214 DVLOG(1) << "MediaStreamDispatcherHost::OnCancelGenerateStream("
215 << render_view_id << ", " 215 << render_view_id << ", "
216 << page_request_id << ")"; 216 << page_request_id << ")";
217 // TODO(perkj): Implement 217
218 NOTIMPLEMENTED(); 218 for (StreamMap::iterator it = streams_.begin(); it != streams_.end(); ++it) {
219 if (it->second.render_view_id == render_view_id &&
220 it->second.page_request_id == page_request_id) {
221 manager()->CancelGenerateStream(it->first);
222 }
223 }
219 } 224 }
220 225
221 void MediaStreamDispatcherHost::OnStopGeneratedStream( 226 void MediaStreamDispatcherHost::OnStopGeneratedStream(
222 int render_view_id, const std::string& label) { 227 int render_view_id, const std::string& label) {
223 DVLOG(1) << "MediaStreamDispatcherHost::OnStopGeneratedStream(" 228 DVLOG(1) << "MediaStreamDispatcherHost::OnStopGeneratedStream("
224 << ", {label = " << label << "})"; 229 << ", {label = " << label << "})";
225 230
226 StreamMap::iterator it = streams_.find(label); 231 StreamMap::iterator it = streams_.find(label);
227 DCHECK(it != streams_.end()); 232 DCHECK(it != streams_.end());
228 manager()->StopGeneratedStream(label); 233 manager()->StopGeneratedStream(label);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 DCHECK(!label.empty()); 271 DCHECK(!label.empty());
267 streams_[label] = StreamRequest(render_view_id, page_request_id); 272 streams_[label] = StreamRequest(render_view_id, page_request_id);
268 } 273 }
269 274
270 MediaStreamManager* MediaStreamDispatcherHost::manager() { 275 MediaStreamManager* MediaStreamDispatcherHost::manager() {
271 return MediaStreamManager::GetForResourceContext( 276 return MediaStreamManager::GetForResourceContext(
272 resource_context_, audio_manager_); 277 resource_context_, audio_manager_);
273 } 278 }
274 279
275 } // namespace media_stream 280 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698