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

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

Issue 10786029: Delete MediaStreamManager in the same way as AudioManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updated unittests Created 8 years, 5 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 | 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/video_capture_manager.h" 5 #include "content/browser/renderer_host/media/video_capture_manager.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void VideoCaptureManager::Register(MediaStreamProviderListener* listener, 52 void VideoCaptureManager::Register(MediaStreamProviderListener* listener,
53 base::MessageLoopProxy* device_thread_loop) { 53 base::MessageLoopProxy* device_thread_loop) {
54 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 54 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
55 DCHECK(!listener_); 55 DCHECK(!listener_);
56 DCHECK(!device_loop_); 56 DCHECK(!device_loop_);
57 listener_ = listener; 57 listener_ = listener;
58 device_loop_ = device_thread_loop; 58 device_loop_ = device_thread_loop;
59 } 59 }
60 60
61 void VideoCaptureManager::Unregister() { 61 void VideoCaptureManager::Unregister() {
62 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
63 DCHECK(listener_); 62 DCHECK(listener_);
64 listener_ = NULL; 63 listener_ = NULL;
65 } 64 }
66 65
67 void VideoCaptureManager::EnumerateDevices() { 66 void VideoCaptureManager::EnumerateDevices() {
68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
69 DCHECK(listener_); 68 DCHECK(listener_);
70 device_loop_->PostTask( 69 device_loop_->PostTask(
71 FROM_HERE, 70 FROM_HERE,
72 base::Bind(&VideoCaptureManager::OnEnumerateDevices, this)); 71 base::Bind(&VideoCaptureManager::OnEnumerateDevices, this));
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 500
502 VideoCaptureDevices::iterator dit = devices_.find(capture_session_id); 501 VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
503 if (dit != devices_.end()) { 502 if (dit != devices_.end()) {
504 return dit->second; 503 return dit->second;
505 } 504 }
506 } 505 }
507 return NULL; 506 return NULL;
508 } 507 }
509 508
510 } // namespace media_stream 509 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698