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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1669993003: Remove deprecated PeerConnectionObserver::OnStateChange and OnIceComplete (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed tests. Created 4 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 | « talk/app/webrtc/webrtcsession.h ('k') | talk/app/webrtc/webrtcsession_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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 2041 matching lines...) Expand 10 before | Expand all | Expand 10 after
2052 ASSERT(signaling_thread()->IsCurrent()); 2052 ASSERT(signaling_thread()->IsCurrent());
2053 if (state == cricket::kIceGatheringGathering) { 2053 if (state == cricket::kIceGatheringGathering) {
2054 if (ice_observer_) { 2054 if (ice_observer_) {
2055 ice_observer_->OnIceGatheringChange( 2055 ice_observer_->OnIceGatheringChange(
2056 PeerConnectionInterface::kIceGatheringGathering); 2056 PeerConnectionInterface::kIceGatheringGathering);
2057 } 2057 }
2058 } else if (state == cricket::kIceGatheringComplete) { 2058 } else if (state == cricket::kIceGatheringComplete) {
2059 if (ice_observer_) { 2059 if (ice_observer_) {
2060 ice_observer_->OnIceGatheringChange( 2060 ice_observer_->OnIceGatheringChange(
2061 PeerConnectionInterface::kIceGatheringComplete); 2061 PeerConnectionInterface::kIceGatheringComplete);
2062 ice_observer_->OnIceComplete();
2063 } 2062 }
2064 } 2063 }
2065 } 2064 }
2066 2065
2067 void WebRtcSession::ReportTransportStats() { 2066 void WebRtcSession::ReportTransportStats() {
2068 // Use a set so we don't report the same stats twice if two channels share 2067 // Use a set so we don't report the same stats twice if two channels share
2069 // a transport. 2068 // a transport.
2070 std::set<std::string> transport_names; 2069 std::set<std::string> transport_names;
2071 if (voice_channel()) { 2070 if (voice_channel()) {
2072 transport_names.insert(voice_channel()->transport_name()); 2071 transport_names.insert(voice_channel()->transport_name());
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
2177 } 2176 }
2178 } 2177 }
2179 2178
2180 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2179 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2181 const rtc::SentPacket& sent_packet) { 2180 const rtc::SentPacket& sent_packet) {
2182 RTC_DCHECK(worker_thread()->IsCurrent()); 2181 RTC_DCHECK(worker_thread()->IsCurrent());
2183 media_controller_->call_w()->OnSentPacket(sent_packet); 2182 media_controller_->call_w()->OnSentPacket(sent_packet);
2184 } 2183 }
2185 2184
2186 } // namespace webrtc 2185 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession.h ('k') | talk/app/webrtc/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698