content/renderer/media/media_stream_source_observer.h - Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

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/renderer/media/media_stream_source_observer.h

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 years, 11 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 | « content/renderer/media/media_stream_source_extra_data.h ('k') | content/renderer/media/media_stream_source_observer.cc » ('j') | content/renderer/media/media_stream_video_capture_device_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_source_observer.h

diff --git a/content/renderer/media/media_stream_source_observer.h b/content/renderer/media/media_stream_source_observer.h

index f7e0b60c4217226b664113f9efdd84676b6df1d9..2bfd63219f2d1f899a1192b156c2e935aa8d5443 100644

--- a/content/renderer/media/media_stream_source_observer.h

+++ b/content/renderer/media/media_stream_source_observer.h

@@ -14,16 +14,16 @@

namespace content {

-class MediaStreamSourceExtraData;

+class MediaStreamSource;

// MediaStreamSourceObserver listens to events on MediaSourceInterface and

-// notify WebKit. It will be owned by MediaStreamSourceExtraData.

+// notify WebKit. It will be owned by MediaStreamSource.

class CONTENT_EXPORT MediaStreamSourceObserver

: NON_EXPORTED_BASE(public webrtc::ObserverInterface),

NON_EXPORTED_BASE(public base::NonThreadSafe) {

public:

MediaStreamSourceObserver(webrtc::MediaSourceInterface* webrtc_source,

- MediaStreamSourceExtraData* extra_data);

+ MediaStreamSource* extra_data);

virtual ~MediaStreamSourceObserver();

private:

@@ -32,7 +32,7 @@ class CONTENT_EXPORT MediaStreamSourceObserver

webrtc::MediaSourceInterface::SourceState state_;

scoped_refptr<webrtc::MediaSourceInterface> webrtc_source_;

- MediaStreamSourceExtraData* extra_data_;

+ MediaStreamSource* extra_data_;

DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceObserver);

};