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

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

Issue 63253002: Rename WebKit namespace to blink (part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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
OLDNEW
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/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
11 #include "content/common/media/media_stream_options.h" 11 #include "content/common/media/media_stream_options.h"
12 #include "content/renderer/media/media_stream_source_observer.h" 12 #include "content/renderer/media/media_stream_source_observer.h"
13 #include "content/renderer/media/webrtc_audio_capturer.h" 13 #include "content/renderer/media/webrtc_audio_capturer.h"
14 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h" 14 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
15 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 15 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 class CONTENT_EXPORT MediaStreamSourceExtraData 19 class CONTENT_EXPORT MediaStreamSourceExtraData
20 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) { 20 : NON_EXPORTED_BASE(public blink::WebMediaStreamSource::ExtraData) {
21 public: 21 public:
22 typedef base::Callback<void(const WebKit::WebMediaStreamSource& source)> 22 typedef base::Callback<void(const blink::WebMediaStreamSource& source)>
23 SourceStopCallback; 23 SourceStopCallback;
24 24
25 MediaStreamSourceExtraData(const StreamDeviceInfo& device_info, 25 MediaStreamSourceExtraData(const StreamDeviceInfo& device_info,
26 const SourceStopCallback& stop_callback); 26 const SourceStopCallback& stop_callback);
27 MediaStreamSourceExtraData(); 27 MediaStreamSourceExtraData();
28 virtual ~MediaStreamSourceExtraData(); 28 virtual ~MediaStreamSourceExtraData();
29 29
30 // Return device information about the camera or microphone. 30 // Return device information about the camera or microphone.
31 const StreamDeviceInfo& device_info() const { 31 const StreamDeviceInfo& device_info() const {
32 return device_info_; 32 return device_info_;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 scoped_refptr<WebRtcAudioCapturer> audio_capturer_; 83 scoped_refptr<WebRtcAudioCapturer> audio_capturer_;
84 84
85 SourceStopCallback stop_callback_; 85 SourceStopCallback stop_callback_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData); 87 DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);
88 }; 88 };
89 89
90 } // namespace content 90 } // namespace content
91 91
92 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_ 92 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_SOURCE_EXTRA_DATA_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_registry_interface.h ('k') | content/renderer/media/media_stream_source_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698