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

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

Issue 11232014: Move a bunch of code in content\renderer to the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 8 years, 2 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
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_EXTRA_DATA_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_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 "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h"
13 13
14 namespace webrtc { 14 namespace webrtc {
15 class MediaStreamInterface; 15 class MediaStreamInterface;
16 class LocalMediaStreamInterface; 16 class LocalMediaStreamInterface;
17 } // namespace webrtc 17 } // namespace webrtc
18 18
19 namespace content {
20
19 class CONTENT_EXPORT MediaStreamExtraData 21 class CONTENT_EXPORT MediaStreamExtraData
20 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) { 22 : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) {
21 public: 23 public:
22 typedef base::Callback<void(const std::string& label)> StreamStopCallback; 24 typedef base::Callback<void(const std::string& label)> StreamStopCallback;
23 25
24 explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream); 26 explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
25 explicit MediaStreamExtraData( 27 explicit MediaStreamExtraData(
26 webrtc::LocalMediaStreamInterface* local_stream); 28 webrtc::LocalMediaStreamInterface* local_stream);
27 virtual ~MediaStreamExtraData(); 29 virtual ~MediaStreamExtraData();
28 30
29 void SetLocalStreamStopCallback( 31 void SetLocalStreamStopCallback(
30 const StreamStopCallback& stop_callback); 32 const StreamStopCallback& stop_callback);
31 void OnLocalStreamStop(); 33 void OnLocalStreamStop();
32 34
33 webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); } 35 webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
34 webrtc::LocalMediaStreamInterface* local_stream() { 36 webrtc::LocalMediaStreamInterface* local_stream() {
35 return local_stream_.get(); 37 return local_stream_.get();
36 } 38 }
37 39
38 private: 40 private:
39 StreamStopCallback stream_stop_callback_; 41 StreamStopCallback stream_stop_callback_;
40 scoped_refptr<webrtc::MediaStreamInterface> remote_stream_; 42 scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
41 scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_; 43 scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;
42 44
43 DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData); 45 DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData);
44 }; 46 };
45 47
48 } // namespace content
49
46 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_ 50 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698