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

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

Issue 2133083002: Remove all remaining traces of MessageLoopProxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <algorithm> 10 #include <algorithm>
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after
1592 audio_input_device_manager()->UseFakeDevice(); 1592 audio_input_device_manager()->UseFakeDevice();
1593 } 1593 }
1594 1594
1595 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is 1595 // TODO(dalecurtis): Remove ScopedTracker below once crbug.com/457525 is
1596 // fixed. 1596 // fixed.
1597 tracked_objects::ScopedTracker tracking_profile4( 1597 tracked_objects::ScopedTracker tracking_profile4(
1598 FROM_HERE_WITH_EXPLICIT_FUNCTION( 1598 FROM_HERE_WITH_EXPLICIT_FUNCTION(
1599 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4")); 1599 "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread 4"));
1600 video_capture_manager_ = 1600 video_capture_manager_ =
1601 new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory( 1601 new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory(
1602 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); 1602 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)));
1603 #if defined(OS_WIN) 1603 #if defined(OS_WIN)
1604 // Use an STA Video Capture Thread to try to avoid crashes on enumeration of 1604 // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
1605 // buggy third party Direct Show modules, http://crbug.com/428958. 1605 // buggy third party Direct Show modules, http://crbug.com/428958.
1606 video_capture_thread_.init_com_with_mta(false); 1606 video_capture_thread_.init_com_with_mta(false);
1607 CHECK(video_capture_thread_.Start()); 1607 CHECK(video_capture_thread_.Start());
1608 video_capture_manager_->Register(this, video_capture_thread_.task_runner()); 1608 video_capture_manager_->Register(this, video_capture_thread_.task_runner());
1609 #else 1609 #else
1610 video_capture_manager_->Register(this, device_task_runner_); 1610 video_capture_manager_->Register(this, device_task_runner_);
1611 #endif 1611 #endif
1612 1612
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2181 if (device_info.session_id == session_id && 2181 if (device_info.session_id == session_id &&
2182 device_info.device.type == type) { 2182 device_info.device.type == type) {
2183 request->SetCapturingLinkSecured(is_secure); 2183 request->SetCapturingLinkSecured(is_secure);
2184 return; 2184 return;
2185 } 2185 }
2186 } 2186 }
2187 } 2187 }
2188 } 2188 }
2189 2189
2190 } // namespace content 2190 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698