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

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

Issue 1170623003: Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <list> 7 #include <list>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 FROM_HERE_WITH_EXPLICIT_FUNCTION( 1663 FROM_HERE_WITH_EXPLICIT_FUNCTION(
1664 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4")); 1664 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4"));
1665 video_capture_manager_ = 1665 video_capture_manager_ =
1666 new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory( 1666 new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory(
1667 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); 1667 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));
1668 #if defined(OS_WIN) 1668 #if defined(OS_WIN)
1669 // Use an STA Video Capture Thread to try to avoid crashes on enumeration of 1669 // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
1670 // buggy third party Direct Show modules, http://crbug.com/428958. 1670 // buggy third party Direct Show modules, http://crbug.com/428958.
1671 video_capture_thread_.init_com_with_mta(false); 1671 video_capture_thread_.init_com_with_mta(false);
1672 CHECK(video_capture_thread_.Start()); 1672 CHECK(video_capture_thread_.Start());
1673 video_capture_manager_->Register(this, video_capture_thread_.task_runner()); 1673 video_capture_manager_->Register(this,
1674 video_capture_thread_.message_loop_proxy());
1674 #else 1675 #else
1675 video_capture_manager_->Register(this, device_task_runner_); 1676 video_capture_manager_->Register(this, device_task_runner_);
1676 #endif 1677 #endif
1677 } 1678 }
1678 1679
1679 void MediaStreamManager::Opened(MediaStreamType stream_type, 1680 void MediaStreamManager::Opened(MediaStreamType stream_type,
1680 int capture_session_id) { 1681 int capture_session_id) {
1681 DCHECK_CURRENTLY_ON(BrowserThread::IO); 1682 DCHECK_CURRENTLY_ON(BrowserThread::IO);
1682 DVLOG(1) << "Opened({stream_type = " << stream_type << "} " 1683 DVLOG(1) << "Opened({stream_type = " << stream_type << "} "
1683 << "{capture_session_id = " << capture_session_id << "})"; 1684 << "{capture_session_id = " << capture_session_id << "})";
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
2196 } 2197 }
2197 } 2198 }
2198 2199
2199 void MediaStreamManager::SetKeyboardMicOnDeviceThread() { 2200 void MediaStreamManager::SetKeyboardMicOnDeviceThread() {
2200 DCHECK(device_task_runner_->BelongsToCurrentThread()); 2201 DCHECK(device_task_runner_->BelongsToCurrentThread());
2201 audio_manager_->SetHasKeyboardMic(); 2202 audio_manager_->SetHasKeyboardMic();
2202 } 2203 }
2203 #endif 2204 #endif
2204 2205
2205 } // namespace content 2206 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698