| OLD | NEW |
| 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 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 705 void PeerConnection::RegisterUMAObserver(UMAObserver* observer) { | 705 void PeerConnection::RegisterUMAObserver(UMAObserver* observer) { |
| 706 uma_observer_ = observer; | 706 uma_observer_ = observer; |
| 707 | 707 |
| 708 if (session_) { | 708 if (session_) { |
| 709 session_->set_metrics_observer(uma_observer_); | 709 session_->set_metrics_observer(uma_observer_); |
| 710 } | 710 } |
| 711 | 711 |
| 712 // Send information about IPv4/IPv6 status. | 712 // Send information about IPv4/IPv6 status. |
| 713 if (uma_observer_ && port_allocator_) { | 713 if (uma_observer_ && port_allocator_) { |
| 714 if (port_allocator_->flags() & cricket::PORTALLOCATOR_ENABLE_IPV6) { | 714 if (port_allocator_->flags() & cricket::PORTALLOCATOR_ENABLE_IPV6) { |
| 715 uma_observer_->IncrementCounter(kPeerConnection_IPv6); | 715 uma_observer_->IncrementEnumCounter( |
| 716 kEnumCounterAddressFamily, kPeerConnection_IPv6, |
| 717 kPeerConnectionAddressFamilyCounter_Max); |
| 716 } else { | 718 } else { |
| 717 uma_observer_->IncrementCounter(kPeerConnection_IPv4); | 719 uma_observer_->IncrementEnumCounter( |
| 720 kEnumCounterAddressFamily, kPeerConnection_IPv4, |
| 721 kPeerConnectionAddressFamilyCounter_Max); |
| 718 } | 722 } |
| 719 } | 723 } |
| 720 } | 724 } |
| 721 | 725 |
| 722 const SessionDescriptionInterface* PeerConnection::local_description() const { | 726 const SessionDescriptionInterface* PeerConnection::local_description() const { |
| 723 return session_->local_description(); | 727 return session_->local_description(); |
| 724 } | 728 } |
| 725 | 729 |
| 726 const SessionDescriptionInterface* PeerConnection::remote_description() const { | 730 const SessionDescriptionInterface* PeerConnection::remote_description() const { |
| 727 return session_->remote_description(); | 731 return session_->remote_description(); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 if (ice_gathering_state_ != kIceGatheringComplete) { | 906 if (ice_gathering_state_ != kIceGatheringComplete) { |
| 903 ice_gathering_state_ = kIceGatheringComplete; | 907 ice_gathering_state_ = kIceGatheringComplete; |
| 904 observer_->OnIceGatheringChange(ice_gathering_state_); | 908 observer_->OnIceGatheringChange(ice_gathering_state_); |
| 905 } | 909 } |
| 906 } | 910 } |
| 907 observer_->OnSignalingChange(signaling_state_); | 911 observer_->OnSignalingChange(signaling_state_); |
| 908 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); | 912 observer_->OnStateChange(PeerConnectionObserver::kSignalingState); |
| 909 } | 913 } |
| 910 | 914 |
| 911 } // namespace webrtc | 915 } // namespace webrtc |
| OLD | NEW |