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

Side by Side Diff: content/renderer/media/peer_connection_tracker.cc

Issue 2511633002: Rename "updateICE" to "setConfiguration", everywhere except in Blink. (Closed)
Patch Set: Making sure updateIce doesn't change behavior in this CL. Created 4 years, 1 month 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "content/renderer/media/peer_connection_tracker.h" 5 #include "content/renderer/media/peer_connection_tracker.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 int id = GetLocalIDForHandler(pc_handler); 517 int id = GetLocalIDForHandler(pc_handler);
518 if (id == -1) 518 if (id == -1)
519 return; 519 return;
520 std::string value = "type: " + type + ", sdp: " + sdp; 520 std::string value = "type: " + type + ", sdp: " + sdp;
521 SendPeerConnectionUpdate( 521 SendPeerConnectionUpdate(
522 id, 522 id,
523 source == SOURCE_LOCAL ? "setLocalDescription" : "setRemoteDescription", 523 source == SOURCE_LOCAL ? "setLocalDescription" : "setRemoteDescription",
524 value); 524 value);
525 } 525 }
526 526
527 void PeerConnectionTracker::TrackUpdateIce( 527 void PeerConnectionTracker::TrackSetConfiguration(
528 RTCPeerConnectionHandler* pc_handler, 528 RTCPeerConnectionHandler* pc_handler,
529 const webrtc::PeerConnectionInterface::RTCConfiguration& config) { 529 const webrtc::PeerConnectionInterface::RTCConfiguration& config) {
530 DCHECK(main_thread_.CalledOnValidThread()); 530 DCHECK(main_thread_.CalledOnValidThread());
531 int id = GetLocalIDForHandler(pc_handler); 531 int id = GetLocalIDForHandler(pc_handler);
532 if (id == -1) 532 if (id == -1)
533 return; 533 return;
534 534
535 std::ostringstream result; 535 std::ostringstream result;
536 result << "servers: " << SerializeServers(config.servers) 536 result << "servers: " << SerializeServers(config.servers)
537 << "iceTransportType: " << SerializeIceTransportType(config.type) 537 << "iceTransportType: " << SerializeIceTransportType(config.type)
538 << "bundlePolicy: " << SerializeBundlePolicy(config.bundle_policy) 538 << "bundlePolicy: " << SerializeBundlePolicy(config.bundle_policy)
539 << "rtcpMuxPolicy: " << SerializeRtcpMuxPolicy(config.rtcp_mux_policy) 539 << "rtcpMuxPolicy: " << SerializeRtcpMuxPolicy(config.rtcp_mux_policy)
540 << "}"; 540 << "}";
541 541
542 SendPeerConnectionUpdate( 542 SendPeerConnectionUpdate(id, "setConfiguration", result.str());
543 id,
544 "updateIce",
545 result.str());
546 } 543 }
547 544
548 void PeerConnectionTracker::TrackAddIceCandidate( 545 void PeerConnectionTracker::TrackAddIceCandidate(
549 RTCPeerConnectionHandler* pc_handler, 546 RTCPeerConnectionHandler* pc_handler,
550 const blink::WebRTCICECandidate& candidate, 547 const blink::WebRTCICECandidate& candidate,
551 Source source, 548 Source source,
552 bool succeeded) { 549 bool succeeded) {
553 DCHECK(main_thread_.CalledOnValidThread()); 550 DCHECK(main_thread_.CalledOnValidThread());
554 int id = GetLocalIDForHandler(pc_handler); 551 int id = GetLocalIDForHandler(pc_handler);
555 if (id == -1) 552 if (id == -1)
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 DCHECK(main_thread_.CalledOnValidThread()); 740 DCHECK(main_thread_.CalledOnValidThread());
744 SendTarget()->Send(new PeerConnectionTrackerHost_UpdatePeerConnection( 741 SendTarget()->Send(new PeerConnectionTrackerHost_UpdatePeerConnection(
745 local_id, std::string(callback_type), value)); 742 local_id, std::string(callback_type), value));
746 } 743 }
747 744
748 void PeerConnectionTracker::OverrideSendTargetForTesting(RenderThread* target) { 745 void PeerConnectionTracker::OverrideSendTargetForTesting(RenderThread* target) {
749 send_target_for_test_ = target; 746 send_target_for_test_ = target;
750 } 747 }
751 748
752 } // namespace content 749 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698