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

Side by Side Diff: content/renderer/media/peer_connection_handler_base.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_PEER_CONNECTION_HANDLER_BASE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_
6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_ 6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 14 matching lines...) Expand all
25 // PeerConnection in libjingle. 25 // PeerConnection in libjingle.
26 class CONTENT_EXPORT PeerConnectionHandlerBase 26 class CONTENT_EXPORT PeerConnectionHandlerBase
27 : NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) { 27 : NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) {
28 public: 28 public:
29 PeerConnectionHandlerBase( 29 PeerConnectionHandlerBase(
30 MediaStreamDependencyFactory* dependency_factory); 30 MediaStreamDependencyFactory* dependency_factory);
31 31
32 protected: 32 protected:
33 virtual ~PeerConnectionHandlerBase(); 33 virtual ~PeerConnectionHandlerBase();
34 34
35 void AddStream(const WebKit::WebMediaStream& stream); 35 void AddStream(const blink::WebMediaStream& stream);
36 bool AddStream(const WebKit::WebMediaStream& stream, 36 bool AddStream(const blink::WebMediaStream& stream,
37 const webrtc::MediaConstraintsInterface* constraints); 37 const webrtc::MediaConstraintsInterface* constraints);
38 void RemoveStream(const WebKit::WebMediaStream& stream); 38 void RemoveStream(const blink::WebMediaStream& stream);
39 39
40 // dependency_factory_ is a raw pointer, and is valid for the lifetime of 40 // dependency_factory_ is a raw pointer, and is valid for the lifetime of
41 // MediaStreamImpl. 41 // MediaStreamImpl.
42 MediaStreamDependencyFactory* dependency_factory_; 42 MediaStreamDependencyFactory* dependency_factory_;
43 43
44 // native_peer_connection_ is the native PeerConnection object, 44 // native_peer_connection_ is the native PeerConnection object,
45 // it handles the ICE processing and media engine. 45 // it handles the ICE processing and media engine.
46 scoped_refptr<webrtc::PeerConnectionInterface> native_peer_connection_; 46 scoped_refptr<webrtc::PeerConnectionInterface> native_peer_connection_;
47 47
48 typedef std::map<webrtc::MediaStreamInterface*, 48 typedef std::map<webrtc::MediaStreamInterface*,
49 content::RemoteMediaStreamImpl*> RemoteStreamMap; 49 content::RemoteMediaStreamImpl*> RemoteStreamMap;
50 RemoteStreamMap remote_streams_; 50 RemoteStreamMap remote_streams_;
51 51
52 // The message loop we are created on and on which to make calls to WebKit. 52 // The message loop we are created on and on which to make calls to WebKit.
53 // This should be the render thread message loop. 53 // This should be the render thread message loop.
54 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 54 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerBase); 56 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerBase);
57 }; 57 };
58 58
59 } // namespace content 59 } // namespace content
60 60
61 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_ 61 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698