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

Side by Side Diff: webrtc/examples/peerconnection/client/conductor.h

Issue 2660223002: Add override declarations to PeerConnectionObserver subclasses, and delete obsolete methods. (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | webrtc/pc/peerconnectionfactory_unittest.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 /* 1 /*
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{}; 77 webrtc::PeerConnectionInterface::IceConnectionState new_state) override{};
78 void OnIceGatheringChange( 78 void OnIceGatheringChange(
79 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{}; 79 webrtc::PeerConnectionInterface::IceGatheringState new_state) override{};
80 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; 80 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
81 void OnIceConnectionReceivingChange(bool receiving) override {} 81 void OnIceConnectionReceivingChange(bool receiving) override {}
82 82
83 // 83 //
84 // PeerConnectionClientObserver implementation. 84 // PeerConnectionClientObserver implementation.
85 // 85 //
86 86
87 virtual void OnSignedIn(); 87 void OnSignedIn() override;
88 88
89 virtual void OnDisconnected(); 89 void OnDisconnected() override;
90 90
91 virtual void OnPeerConnected(int id, const std::string& name); 91 void OnPeerConnected(int id, const std::string& name) override;
92 92
93 virtual void OnPeerDisconnected(int id); 93 void OnPeerDisconnected(int id) override;
94 94
95 virtual void OnMessageFromPeer(int peer_id, const std::string& message); 95 void OnMessageFromPeer(int peer_id, const std::string& message) override;
96 96
97 virtual void OnMessageSent(int err); 97 void OnMessageSent(int err) override;
98 98
99 virtual void OnServerConnectionFailure(); 99 void OnServerConnectionFailure() override;
100 100
101 // 101 //
102 // MainWndCallback implementation. 102 // MainWndCallback implementation.
103 // 103 //
104 104
105 virtual void StartLogin(const std::string& server, int port); 105 void StartLogin(const std::string& server, int port) override;
106 106
107 virtual void DisconnectFromServer(); 107 void DisconnectFromServer() override;
108 108
109 virtual void ConnectToPeer(int peer_id); 109 void ConnectToPeer(int peer_id) override;
110 110
111 virtual void DisconnectFromCurrentPeer(); 111 void DisconnectFromCurrentPeer() override;
112 112
113 virtual void UIThreadCallback(int msg_id, void* data); 113 void UIThreadCallback(int msg_id, void* data) override;
114 114
115 // CreateSessionDescriptionObserver implementation. 115 // CreateSessionDescriptionObserver implementation.
116 virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc); 116 void OnSuccess(webrtc::SessionDescriptionInterface* desc) override;
117 virtual void OnFailure(const std::string& error); 117 void OnFailure(const std::string& error) override;
118 118
119 protected: 119 protected:
120 // Send a message to the remote peer. 120 // Send a message to the remote peer.
121 void SendMessage(const std::string& json_object); 121 void SendMessage(const std::string& json_object);
122 122
123 int peer_id_; 123 int peer_id_;
124 bool loopback_; 124 bool loopback_;
125 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_; 125 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
126 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 126 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
127 peer_connection_factory_; 127 peer_connection_factory_;
128 PeerConnectionClient* client_; 128 PeerConnectionClient* client_;
129 MainWindow* main_wnd_; 129 MainWindow* main_wnd_;
130 std::deque<std::string*> pending_messages_; 130 std::deque<std::string*> pending_messages_;
131 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> > 131 std::map<std::string, rtc::scoped_refptr<webrtc::MediaStreamInterface> >
132 active_streams_; 132 active_streams_;
133 std::string server_; 133 std::string server_;
134 }; 134 };
135 135
136 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_ 136 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_CONDUCTOR_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/pc/peerconnectionfactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698