OLD | NEW |
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/media_stream_manager.h" | 5 #include "content/browser/renderer_host/media/media_stream_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1228 tracked_objects::ScopedTracker tracking_profile1( | 1228 tracked_objects::ScopedTracker tracking_profile1( |
1229 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 1229 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
1230 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 1")); | 1230 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 1")); |
1231 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 1231 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
1232 | 1232 |
1233 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is | 1233 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is |
1234 // fixed. | 1234 // fixed. |
1235 tracked_objects::ScopedTracker tracking_profile2( | 1235 tracked_objects::ScopedTracker tracking_profile2( |
1236 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 1236 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
1237 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 2")); | 1237 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 2")); |
1238 audio_input_device_manager_ = | 1238 audio_input_device_manager_ = new AudioInputDeviceManager(audio_system_); |
1239 new AudioInputDeviceManager(audio_system_->GetAudioManager()); | |
1240 audio_input_device_manager_->RegisterListener(this); | 1239 audio_input_device_manager_->RegisterListener(this); |
1241 | 1240 |
1242 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is | 1241 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is |
1243 // fixed. | 1242 // fixed. |
1244 tracked_objects::ScopedTracker tracking_profile3( | 1243 tracked_objects::ScopedTracker tracking_profile3( |
1245 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 1244 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
1246 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 3")); | 1245 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 3")); |
1247 // We want to be notified of IO message loop destruction to delete the thread | 1246 // We want to be notified of IO message loop destruction to delete the thread |
1248 // and the device managers. | 1247 // and the device managers. |
1249 base::MessageLoop::current()->AddDestructionObserver(this); | 1248 base::MessageLoop::current()->AddDestructionObserver(this); |
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1768 request->ui_proxy->OnStarted( | 1767 request->ui_proxy->OnStarted( |
1769 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser, | 1768 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser, |
1770 base::Unretained(this), label), | 1769 base::Unretained(this), label), |
1771 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId, | 1770 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId, |
1772 base::Unretained(this), request->video_type(), | 1771 base::Unretained(this), request->video_type(), |
1773 request->devices)); | 1772 request->devices)); |
1774 } | 1773 } |
1775 } | 1774 } |
1776 | 1775 |
1777 } // namespace content | 1776 } // namespace content |
OLD | NEW |