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

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

Issue 10824143: Rolling libjingle r164. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 4 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_JSEP_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_JSEP_H_
6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_JSEP_H_ 6 #define CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_JSEP_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 const WebKit::WebICECandidateDescriptor& candidate) OVERRIDE; 48 const WebKit::WebICECandidateDescriptor& candidate) OVERRIDE;
49 virtual void addStream( 49 virtual void addStream(
50 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 50 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
51 virtual void removeStream( 51 virtual void removeStream(
52 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE; 52 const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
53 // We will be deleted by WebKit after stop has been returned. 53 // We will be deleted by WebKit after stop has been returned.
54 virtual void stop() OVERRIDE; 54 virtual void stop() OVERRIDE;
55 55
56 // webrtc::PeerConnectionObserver implementation 56 // webrtc::PeerConnectionObserver implementation
57 virtual void OnError() OVERRIDE; 57 virtual void OnError() OVERRIDE;
58 virtual void OnMessage(const std::string& msg) OVERRIDE;
59 virtual void OnSignalingMessage(const std::string& msg) OVERRIDE;
60 virtual void OnStateChange(StateType state_changed) OVERRIDE; 58 virtual void OnStateChange(StateType state_changed) OVERRIDE;
61 virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE; 59 virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
62 virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE; 60 virtual void OnRemoveStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
63 virtual void OnIceCandidate( 61 virtual void OnIceCandidate(
64 const webrtc::IceCandidateInterface* candidate) OVERRIDE; 62 const webrtc::IceCandidateInterface* candidate) OVERRIDE;
65 virtual void OnIceComplete() OVERRIDE; 63 virtual void OnIceComplete() OVERRIDE;
66 64
67 private: 65 private:
68 webrtc::SessionDescriptionInterface* CreateNativeSessionDescription( 66 webrtc::SessionDescriptionInterface* CreateNativeSessionDescription(
69 const WebKit::WebSessionDescriptionDescriptor& description); 67 const WebKit::WebSessionDescriptionDescriptor& description);
70 WebKit::WebSessionDescriptionDescriptor CreateWebKitSessionDescription( 68 WebKit::WebSessionDescriptionDescriptor CreateWebKitSessionDescription(
71 const webrtc::SessionDescriptionInterface* native_desc); 69 const webrtc::SessionDescriptionInterface* native_desc);
72 bool GetNativeAction( 70 bool GetNativeAction(
73 const Action action, 71 const Action action,
74 webrtc::PeerConnectionInterface::Action* native_action); 72 webrtc::PeerConnectionInterface::Action* native_action);
75 73
76 // client_ is a weak pointer, and is valid until stop() has returned. 74 // client_ is a weak pointer, and is valid until stop() has returned.
77 WebKit::WebPeerConnection00HandlerClient* client_; 75 WebKit::WebPeerConnection00HandlerClient* client_;
78 76
79 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerJsep); 77 DISALLOW_COPY_AND_ASSIGN(PeerConnectionHandlerJsep);
80 }; 78 };
81 79
82 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_JSEP_H_ 80 #endif // CONTENT_RENDERER_MEDIA_PEER_CONNECTION_HANDLER_JSEP_H_
OLDNEW
« no previous file with comments | « content/renderer/media/mock_peer_connection_impl.cc ('k') | content/renderer/media/peer_connection_handler_jsep.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698