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

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

Issue 12084088: Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | « no previous file | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CENTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.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 "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
11 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCente r.h" 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCente r.h"
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCompo nent.h" 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h"
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescr iptor.h"
14 14
15 namespace WebKit { 15 namespace WebKit {
16 class WebMediaStreamCenterClient; 16 class WebMediaStreamCenterClient;
17 } 17 }
18 18
19 namespace content { 19 namespace content {
20 class MediaStreamDependencyFactory; 20 class MediaStreamDependencyFactory;
21 21
22 class CONTENT_EXPORT MediaStreamCenter 22 class CONTENT_EXPORT MediaStreamCenter
23 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter) { 23 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamCenter) {
24 public: 24 public:
25 MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client, 25 MediaStreamCenter(WebKit::WebMediaStreamCenterClient* client,
26 MediaStreamDependencyFactory* factory); 26 MediaStreamDependencyFactory* factory);
27 27
28 virtual void queryMediaStreamSources( 28 virtual void queryMediaStreamSources(
29 const WebKit::WebMediaStreamSourcesRequest& request) OVERRIDE; 29 const WebKit::WebMediaStreamSourcesRequest& request) OVERRIDE;
30 30
31 virtual void didEnableMediaStreamTrack( 31 virtual void didEnableMediaStreamTrack(
32 const WebKit::WebMediaStreamDescriptor& stream, 32 const WebKit::WebMediaStream& stream,
33 const WebKit::WebMediaStreamComponent& component) OVERRIDE; 33 const WebKit::WebMediaStreamTrack& component) OVERRIDE;
34 34
35 virtual void didDisableMediaStreamTrack( 35 virtual void didDisableMediaStreamTrack(
36 const WebKit::WebMediaStreamDescriptor& stream, 36 const WebKit::WebMediaStream& stream,
37 const WebKit::WebMediaStreamComponent& component) OVERRIDE; 37 const WebKit::WebMediaStreamTrack& component) OVERRIDE;
38 38
39 virtual void didStopLocalMediaStream( 39 virtual void didStopLocalMediaStream(
40 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 40 const WebKit::WebMediaStream& stream) OVERRIDE;
41 41
42 virtual void didCreateMediaStream( 42 virtual void didCreateMediaStream(
43 WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 43 WebKit::WebMediaStream& stream) OVERRIDE;
44 44
45 private: 45 private:
46 // |rtc_factory_| is a weak pointer and is owned by the RenderThreadImpl. 46 // |rtc_factory_| is a weak pointer and is owned by the RenderThreadImpl.
47 // It is valid as long as RenderThreadImpl exist. 47 // It is valid as long as RenderThreadImpl exist.
48 MediaStreamDependencyFactory* rtc_factory_; 48 MediaStreamDependencyFactory* rtc_factory_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter); 50 DISALLOW_COPY_AND_ASSIGN(MediaStreamCenter);
51 }; 51 };
52 52
53 } // namespace content 53 } // namespace content
54 54
55 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_ 55 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CENTER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698