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

Unified Diff: trunk/src/content/browser/renderer_host/media/media_stream_manager.h

Issue 18325021: Revert 208403 "Remove MediaStreamDeviceThread in favor of using ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/renderer_host/media/media_stream_manager.h
===================================================================
--- trunk/src/content/browser/renderer_host/media/media_stream_manager.h (revision 210020)
+++ trunk/src/content/browser/renderer_host/media/media_stream_manager.h (working copy)
@@ -35,6 +35,10 @@
#include "content/common/media/media_stream_options.h"
#include "content/common/content_export.h"
+namespace base {
+class Thread;
+}
+
namespace media {
class AudioManager;
}
@@ -203,7 +207,7 @@
void StopMonitoring();
// Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
- scoped_refptr<base::MessageLoopProxy> device_loop_;
+ scoped_ptr<base::Thread> device_thread_;
media::AudioManager* const audio_manager_; // not owned
scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
« no previous file with comments | « no previous file | trunk/src/content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698