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

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

Issue 9727011: Roll libjingle to r126. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | « DEPS ('k') | content/renderer/media/mock_peer_connection_impl.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_MOCK_PEER_CONNECTION_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 14 matching lines...) Expand all
25 virtual talk_base::scoped_refptr<StreamCollectionInterface> 25 virtual talk_base::scoped_refptr<StreamCollectionInterface>
26 local_streams() OVERRIDE; 26 local_streams() OVERRIDE;
27 virtual talk_base::scoped_refptr<StreamCollectionInterface> 27 virtual talk_base::scoped_refptr<StreamCollectionInterface>
28 remote_streams() OVERRIDE; 28 remote_streams() OVERRIDE;
29 virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE; 29 virtual void AddStream(LocalMediaStreamInterface* stream) OVERRIDE;
30 virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE; 30 virtual void RemoveStream(LocalMediaStreamInterface* stream) OVERRIDE;
31 virtual void CommitStreamChanges() OVERRIDE; 31 virtual void CommitStreamChanges() OVERRIDE;
32 virtual void Close() OVERRIDE; 32 virtual void Close() OVERRIDE;
33 virtual ReadyState ready_state() OVERRIDE; 33 virtual ReadyState ready_state() OVERRIDE;
34 virtual SdpState sdp_state() OVERRIDE; 34 virtual SdpState sdp_state() OVERRIDE;
35 virtual void StartIce(IceOptions options) OVERRIDE; 35 virtual bool StartIce(IceOptions options) OVERRIDE;
36 36
37 virtual webrtc::SessionDescriptionInterface* CreateOffer( 37 virtual webrtc::SessionDescriptionInterface* CreateOffer(
38 const webrtc::MediaHints& hints) OVERRIDE; 38 const webrtc::MediaHints& hints) OVERRIDE;
39 virtual webrtc::SessionDescriptionInterface* CreateAnswer( 39 virtual webrtc::SessionDescriptionInterface* CreateAnswer(
40 const webrtc::MediaHints& hints, 40 const webrtc::MediaHints& hints,
41 const webrtc::SessionDescriptionInterface* offer) OVERRIDE; 41 const webrtc::SessionDescriptionInterface* offer) OVERRIDE;
42 virtual bool SetLocalDescription( 42 virtual bool SetLocalDescription(
43 Action action, 43 Action action,
44 webrtc::SessionDescriptionInterface* desc) OVERRIDE; 44 webrtc::SessionDescriptionInterface* desc) OVERRIDE;
45 virtual bool SetRemoteDescription( 45 virtual bool SetRemoteDescription(
(...skipping 21 matching lines...) Expand all
67 std::string stream_label_; 67 std::string stream_label_;
68 bool stream_changes_committed_; 68 bool stream_changes_committed_;
69 talk_base::scoped_refptr<MockStreamCollection> remote_streams_; 69 talk_base::scoped_refptr<MockStreamCollection> remote_streams_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl); 71 DISALLOW_COPY_AND_ASSIGN(MockPeerConnectionImpl);
72 }; 72 };
73 73
74 } // namespace webrtc 74 } // namespace webrtc
75 75
76 #endif // CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_ 76 #endif // CONTENT_RENDERER_MEDIA_MOCK_PEER_CONNECTION_IMPL_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/mock_peer_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698