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

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager.cc

Issue 2696533002: Rmoving the notion of task runner from MediaStreamProvider interface. (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_input_device_manager.cc
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc
index d2db4e19282a150c96c998f88befa56d71b886ac..890f0e827b4a90ce41023aacf8c724a26228b372 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -33,12 +33,13 @@ const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1;
AudioInputDeviceManager::AudioInputDeviceManager(
media::AudioManager* audio_manager)
- : listener_(NULL),
+ : listener_(nullptr),
next_capture_session_id_(kFirstSessionId),
#if defined(OS_CHROMEOS)
keyboard_mic_streams_count_(0),
#endif
- audio_manager_(audio_manager) {
+ audio_manager_(audio_manager),
+ device_task_runner_(audio_manager_->GetTaskRunner()) {
}
AudioInputDeviceManager::~AudioInputDeviceManager() {
@@ -49,24 +50,23 @@ const StreamDeviceInfo* AudioInputDeviceManager::GetOpenedDeviceInfoById(
DCHECK_CURRENTLY_ON(BrowserThread::IO);
StreamDeviceList::iterator device = GetDevice(session_id);
if (device == devices_.end())
- return NULL;
+ return nullptr;
return &(*device);
}
-void AudioInputDeviceManager::Register(
- MediaStreamProviderListener* listener,
- const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner) {
+void AudioInputDeviceManager::RegisterListener(
+ MediaStreamProviderListener* listener) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(!listener_);
- DCHECK(!device_task_runner_.get());
+ DCHECK(device_task_runner_);
listener_ = listener;
- device_task_runner_ = device_task_runner;
}
-void AudioInputDeviceManager::Unregister() {
+void AudioInputDeviceManager::UnregisterListener() {
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
DCHECK(listener_);
- listener_ = NULL;
+ listener_ = nullptr;
}
int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) {

Powered by Google App Engine
This is Rietveld 408576698