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

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

Issue 501033003: Remove implicit conversions from scoped_refptr to T* in content/browser/renderer_host/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/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/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/common/media_stream_request.h" 10 #include "content/public/common/media_stream_request.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 return NULL; 42 return NULL;
43 43
44 return &(*device); 44 return &(*device);
45 } 45 }
46 46
47 void AudioInputDeviceManager::Register( 47 void AudioInputDeviceManager::Register(
48 MediaStreamProviderListener* listener, 48 MediaStreamProviderListener* listener,
49 const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner) { 49 const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner) {
50 DCHECK_CURRENTLY_ON(BrowserThread::IO); 50 DCHECK_CURRENTLY_ON(BrowserThread::IO);
51 DCHECK(!listener_); 51 DCHECK(!listener_);
52 DCHECK(!device_task_runner_); 52 DCHECK(!device_task_runner_.get());
53 listener_ = listener; 53 listener_ = listener;
54 device_task_runner_ = device_task_runner; 54 device_task_runner_ = device_task_runner;
55 } 55 }
56 56
57 void AudioInputDeviceManager::Unregister() { 57 void AudioInputDeviceManager::Unregister() {
58 DCHECK(listener_); 58 DCHECK(listener_);
59 listener_ = NULL; 59 listener_ = NULL;
60 } 60 }
61 61
62 void AudioInputDeviceManager::EnumerateDevices(MediaStreamType stream_type) { 62 void AudioInputDeviceManager::EnumerateDevices(MediaStreamType stream_type) {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 static const char kFakeDeviceId2[] = "fake_audio_2"; 244 static const char kFakeDeviceId2[] = "fake_audio_2";
245 DCHECK(device_names->empty()); 245 DCHECK(device_names->empty());
246 DCHECK(use_fake_device_); 246 DCHECK(use_fake_device_);
247 device_names->push_back(media::AudioDeviceName(kFakeDeviceName1, 247 device_names->push_back(media::AudioDeviceName(kFakeDeviceName1,
248 kFakeDeviceId1)); 248 kFakeDeviceId1));
249 device_names->push_back(media::AudioDeviceName(kFakeDeviceName2, 249 device_names->push_back(media::AudioDeviceName(kFakeDeviceName2,
250 kFakeDeviceId2)); 250 kFakeDeviceId2));
251 } 251 }
252 252
253 } // namespace content 253 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698