content/browser/renderer_host/media/media_stream_manager.h - Issue 8818012: Remove the AudioManager singleton.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8818012: Remove the AudioManager singleton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Set svn eol properties for a couple of files Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/media/media_stream_manager.h

===================================================================

--- content/browser/renderer_host/media/media_stream_manager.h (revision 114012)

+++ content/browser/renderer_host/media/media_stream_manager.h (working copy)

@@ -25,11 +25,14 @@

#include "base/basictypes.h"

#include "base/memory/scoped_ptr.h"

+#include "base/memory/ref_counted.h"

#include "content/browser/renderer_host/media/media_stream_provider.h"

#include "content/browser/renderer_host/media/media_stream_settings_requester.h"

#include "content/common/media/media_stream_options.h"

#include "content/common/content_export.h"

+class AudioManager;

namespace media_stream {

class AudioInputDeviceManager;

@@ -45,7 +48,7 @@

: public MediaStreamProviderListener,

public SettingsRequester {

public:

- MediaStreamManager();

+ explicit MediaStreamManager(AudioManager* audio_manager);

virtual ~MediaStreamManager();

// Used to access VideoCaptureManager.

@@ -109,6 +112,7 @@

// All non-closed request.

typedef std::map<std::string, DeviceRequest> DeviceRequests;

DeviceRequests requests_;

+ scoped_refptr<AudioManager> audio_manager_;

DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);

};