content/renderer/media/media_stream_source_extra_data.h - Issue 15462003: Update references to Blink's Platform API headers

Side by Side Diff

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

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

Side by Side Diff: content/renderer/media/media_stream_source_extra_data.h

Issue 15462003: Update references to Blink's Platform API headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « content/renderer/media/media_stream_registry_interface.h ('k') | content/renderer/media/media_stream_source_observer.h » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_	5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_

6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_	6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_

7	7

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "content/common/content_export.h"	9 #include "content/common/content_export.h"

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

11 #include "content/renderer/media/media_stream_source_observer.h"	11 #include "content/renderer/media/media_stream_source_observer.h"

12 #include "media/base/audio_capturer_source.h"	12 #include "media/base/audio_capturer_source.h"

13 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"	13 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"

14 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h"	14 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

15	15

16 namespace content {	16 namespace content {

17	17

18 class CONTENT_EXPORT MediaStreamSourceExtraData	18 class CONTENT_EXPORT MediaStreamSourceExtraData

19 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) {	19 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) {

20 public:	20 public:

21 MediaStreamSourceExtraData(	21 MediaStreamSourceExtraData(

22 const StreamDeviceInfo& device_info,	22 const StreamDeviceInfo& device_info,

23 const WebKit::WebMediaStreamSource& webkit_source);	23 const WebKit::WebMediaStreamSource& webkit_source);

24 explicit MediaStreamSourceExtraData(	24 explicit MediaStreamSourceExtraData(

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 // carries audio options.	73 // carries audio options.

74 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;	74 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;

75 scoped_ptr<MediaStreamSourceObserver> source_observer_;	75 scoped_ptr<MediaStreamSourceObserver> source_observer_;

76	76

77 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);	77 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);

78 };	78 };

79	79

80 } // namespace content	80 } // namespace content

81	81

82 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_	82 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_

OLD	NEW