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

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

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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
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
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h" 14 #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
15 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" 15 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h"
17 17
18 class MediaStreamDependencyFactory; 18 class MediaStreamDependencyFactory;
19 19
20 // PeerConnectionHandlerBase is the base class of a delegate for the 20 // PeerConnectionHandlerBase is the base class of a delegate for the
21 // PeerConnection (JSEP or ROAP) API messages going between WebKit and native 21 // PeerConnection (JSEP or ROAP) API messages going between WebKit and native
22 // PeerConnection in libjingle. ROAP PeerConnection will be removed soon. 22 // PeerConnection in libjingle. ROAP PeerConnection will be removed soon.
23 class CONTENT_EXPORT PeerConnectionHandlerBase 23 class CONTENT_EXPORT PeerConnectionHandlerBase
24 : NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) { 24 : NON_EXPORTED_BASE(public webrtc::PeerConnectionObserver) {
25 public: 25 public:
(...skipping 22 matching lines...) Expand all
48 RemoteStreamMap remote_streams_; 48 RemoteStreamMap remote_streams_;
49 49
50 // The message loop we are created on and on which to make calls to WebKit. 50 // The message loop we are created on and on which to make calls to WebKit.
51 // This should be the render thread message loop. 51 // This should be the render thread message loop.
52 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 52 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerBase); 54 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerBase);
55 }; 55 };
56 56
57 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_ 57 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_BASE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/mock_peer_connection_impl.h ('k') | content/renderer/media/peer_connection_handler_jsep_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698