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

Unified Diff: content/browser/renderer_host/media/video_capture_host.cc

Issue 10662049: Move the device enumerate/open/close work to device thread from IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: small changes to fix the trybots' failure Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_host.cc
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index 97da80d829bbe2d4c2ef7d544ca62d3960376bca..4bf69f1442d8ce254e1a577913de938b25409f50 100644
--- a/content/browser/renderer_host/media/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -7,10 +7,12 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
+#include "content/browser/browser_main_loop.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/media/video_capture_messages.h"
+using content::BrowserMainLoop;
using content::BrowserMessageFilter;
using content::BrowserThread;
@@ -23,11 +25,7 @@ struct VideoCaptureHost::Entry {
scoped_refptr<VideoCaptureController> controller;
};
-VideoCaptureHost::VideoCaptureHost(content::ResourceContext* resource_context,
- media::AudioManager* audio_manager)
- : resource_context_(resource_context),
- audio_manager_(audio_manager) {
-}
+VideoCaptureHost::VideoCaptureHost() {}
VideoCaptureHost::~VideoCaptureHost() {}
@@ -281,6 +279,5 @@ void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread(
media_stream::VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- return media_stream::MediaStreamManager::GetForResourceContext(
- resource_context_, audio_manager_)->video_capture_manager();
+ return BrowserMainLoop::GetMediaStreamManager()->video_capture_manager();
}

Powered by Google App Engine
This is Rietveld 408576698