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

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

Issue 216473002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to r260263 Created 6 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_capture_devices_impl.h" 5 #include "content/browser/renderer_host/media/media_capture_devices_impl.h"
6 6
7 #include "content/browser/browser_main_loop.h" 7 #include "content/browser/browser_main_loop.h"
8 #include "content/browser/renderer_host/media/media_stream_manager.h" 8 #include "content/browser/renderer_host/media/media_stream_manager.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 namespace { 13 namespace {
14 14
15 void EnsureMonitorCaptureDevices() { 15 void EnsureMonitorCaptureDevices() {
16 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 16 DCHECK_CURRENTLY_ON(BrowserThread::UI);
17 BrowserThread::PostTask( 17 BrowserThread::PostTask(
18 BrowserThread::IO, FROM_HERE, 18 BrowserThread::IO, FROM_HERE,
19 base::Bind(&MediaStreamManager::EnsureDeviceMonitorStarted, 19 base::Bind(&MediaStreamManager::EnsureDeviceMonitorStarted,
20 base::Unretained( 20 base::Unretained(
21 BrowserMainLoop::GetInstance()->media_stream_manager()))); 21 BrowserMainLoop::GetInstance()->media_stream_manager())));
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 MediaCaptureDevices* MediaCaptureDevices::GetInstance() { 26 MediaCaptureDevices* MediaCaptureDevices::GetInstance() {
27 return MediaCaptureDevicesImpl::GetInstance(); 27 return MediaCaptureDevicesImpl::GetInstance();
28 } 28 }
29 29
30 MediaCaptureDevicesImpl* MediaCaptureDevicesImpl::GetInstance() { 30 MediaCaptureDevicesImpl* MediaCaptureDevicesImpl::GetInstance() {
31 return Singleton<MediaCaptureDevicesImpl>::get(); 31 return Singleton<MediaCaptureDevicesImpl>::get();
32 } 32 }
33 33
34 const MediaStreamDevices& 34 const MediaStreamDevices&
35 MediaCaptureDevicesImpl::GetAudioCaptureDevices() { 35 MediaCaptureDevicesImpl::GetAudioCaptureDevices() {
36 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 36 DCHECK_CURRENTLY_ON(BrowserThread::UI);
37 if (!devices_enumerated_) { 37 if (!devices_enumerated_) {
38 EnsureMonitorCaptureDevices(); 38 EnsureMonitorCaptureDevices();
39 devices_enumerated_ = true; 39 devices_enumerated_ = true;
40 } 40 }
41 return audio_devices_; 41 return audio_devices_;
42 } 42 }
43 43
44 const MediaStreamDevices& 44 const MediaStreamDevices&
45 MediaCaptureDevicesImpl::GetVideoCaptureDevices() { 45 MediaCaptureDevicesImpl::GetVideoCaptureDevices() {
46 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 46 DCHECK_CURRENTLY_ON(BrowserThread::UI);
47 if (!devices_enumerated_) { 47 if (!devices_enumerated_) {
48 EnsureMonitorCaptureDevices(); 48 EnsureMonitorCaptureDevices();
49 devices_enumerated_ = true; 49 devices_enumerated_ = true;
50 } 50 }
51 return video_devices_; 51 return video_devices_;
52 } 52 }
53 53
54 void MediaCaptureDevicesImpl::OnAudioCaptureDevicesChanged( 54 void MediaCaptureDevicesImpl::OnAudioCaptureDevicesChanged(
55 const MediaStreamDevices& devices) { 55 const MediaStreamDevices& devices) {
56 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { 56 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
(...skipping 20 matching lines...) Expand all
77 77
78 MediaCaptureDevicesImpl::MediaCaptureDevicesImpl() 78 MediaCaptureDevicesImpl::MediaCaptureDevicesImpl()
79 : devices_enumerated_(false) { 79 : devices_enumerated_(false) {
80 } 80 }
81 81
82 MediaCaptureDevicesImpl::~MediaCaptureDevicesImpl() { 82 MediaCaptureDevicesImpl::~MediaCaptureDevicesImpl() {
83 } 83 }
84 84
85 void MediaCaptureDevicesImpl::UpdateAudioDevicesOnUIThread( 85 void MediaCaptureDevicesImpl::UpdateAudioDevicesOnUIThread(
86 const MediaStreamDevices& devices) { 86 const MediaStreamDevices& devices) {
87 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 87 DCHECK_CURRENTLY_ON(BrowserThread::UI);
88 devices_enumerated_ = true; 88 devices_enumerated_ = true;
89 audio_devices_ = devices; 89 audio_devices_ = devices;
90 } 90 }
91 91
92 void MediaCaptureDevicesImpl::UpdateVideoDevicesOnUIThread( 92 void MediaCaptureDevicesImpl::UpdateVideoDevicesOnUIThread(
93 const MediaStreamDevices& devices) { 93 const MediaStreamDevices& devices) {
94 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 94 DCHECK_CURRENTLY_ON(BrowserThread::UI);
95 devices_enumerated_ = true; 95 devices_enumerated_ = true;
96 video_devices_ = devices; 96 video_devices_ = devices;
97 } 97 }
98 98
99 } // namespace content 99 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698