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

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

Issue 10786029: Delete MediaStreamManager in the same way as AudioManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the pyauto test 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/audio_input_device_manager.h" 5 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/renderer_host/media/audio_input_device_manager_event_h andler.h" 9 #include "content/browser/renderer_host/media/audio_input_device_manager_event_h andler.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 24 matching lines...) Expand all
35 MediaStreamProviderListener* listener, 35 MediaStreamProviderListener* listener,
36 base::MessageLoopProxy* device_thread_loop) { 36 base::MessageLoopProxy* device_thread_loop) {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
38 DCHECK(!listener_); 38 DCHECK(!listener_);
39 DCHECK(!device_loop_); 39 DCHECK(!device_loop_);
40 listener_ = listener; 40 listener_ = listener;
41 device_loop_ = device_thread_loop; 41 device_loop_ = device_thread_loop;
42 } 42 }
43 43
44 void AudioInputDeviceManager::Unregister() { 44 void AudioInputDeviceManager::Unregister() {
45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
46 DCHECK(listener_); 45 DCHECK(listener_);
47 listener_ = NULL; 46 listener_ = NULL;
48 } 47 }
49 48
50 void AudioInputDeviceManager::EnumerateDevices() { 49 void AudioInputDeviceManager::EnumerateDevices() {
51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
52 DCHECK(listener_); 51 DCHECK(listener_);
53 52
54 device_loop_->PostTask( 53 device_loop_->PostTask(
55 FROM_HERE, 54 FROM_HERE,
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 if (listener_) 204 if (listener_)
206 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, 205 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE,
207 session_id); 206 session_id);
208 } 207 }
209 208
210 bool AudioInputDeviceManager::IsOnDeviceThread() const { 209 bool AudioInputDeviceManager::IsOnDeviceThread() const {
211 return device_loop_->BelongsToCurrentThread(); 210 return device_loop_->BelongsToCurrentThread();
212 } 211 }
213 212
214 } // namespace media_stream 213 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698