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

Side by Side Diff: net/base/network_change_notifier.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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 | « net/base/network_change_notifier.h ('k') | net/base/sdch_manager.h » ('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 #include "net/base/network_change_notifier.h" 5 #include "net/base/network_change_notifier.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 789
790 // static 790 // static
791 void NetworkChangeNotifier::SetTestNotificationsOnly(bool test_only) { 791 void NetworkChangeNotifier::SetTestNotificationsOnly(bool test_only) {
792 if (g_network_change_notifier) 792 if (g_network_change_notifier)
793 g_network_change_notifier->test_notifications_only_ = test_only; 793 g_network_change_notifier->test_notifications_only_ = test_only;
794 } 794 }
795 795
796 NetworkChangeNotifier::NetworkChangeNotifier( 796 NetworkChangeNotifier::NetworkChangeNotifier(
797 const NetworkChangeCalculatorParams& params 797 const NetworkChangeCalculatorParams& params
798 /*= NetworkChangeCalculatorParams()*/) 798 /*= NetworkChangeCalculatorParams()*/)
799 : ip_address_observer_list_(new ObserverListThreadSafe<IPAddressObserver>( 799 : ip_address_observer_list_(
800 base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)), 800 new base::ObserverListThreadSafe<IPAddressObserver>(
801 base::ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
801 connection_type_observer_list_( 802 connection_type_observer_list_(
802 new ObserverListThreadSafe<ConnectionTypeObserver>( 803 new base::ObserverListThreadSafe<ConnectionTypeObserver>(
803 base::ObserverListBase< 804 base::ObserverListBase<
804 ConnectionTypeObserver>::NOTIFY_EXISTING_ONLY)), 805 ConnectionTypeObserver>::NOTIFY_EXISTING_ONLY)),
805 resolver_state_observer_list_(new ObserverListThreadSafe<DNSObserver>( 806 resolver_state_observer_list_(
806 base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)), 807 new base::ObserverListThreadSafe<DNSObserver>(
807 network_change_observer_list_(new ObserverListThreadSafe< 808 base::ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)),
809 network_change_observer_list_(new base::ObserverListThreadSafe<
808 NetworkChangeObserver>( 810 NetworkChangeObserver>(
809 base::ObserverListBase<NetworkChangeObserver>::NOTIFY_EXISTING_ONLY)), 811 base::ObserverListBase<NetworkChangeObserver>::NOTIFY_EXISTING_ONLY)),
810 max_bandwidth_observer_list_(new ObserverListThreadSafe< 812 max_bandwidth_observer_list_(new base::ObserverListThreadSafe<
811 MaxBandwidthObserver>( 813 MaxBandwidthObserver>(
812 base::ObserverListBase<MaxBandwidthObserver>::NOTIFY_EXISTING_ONLY)), 814 base::ObserverListBase<MaxBandwidthObserver>::NOTIFY_EXISTING_ONLY)),
813 network_state_(new NetworkState()), 815 network_state_(new NetworkState()),
814 network_change_calculator_(new NetworkChangeCalculator(params)), 816 network_change_calculator_(new NetworkChangeCalculator(params)),
815 test_notifications_only_(false) { 817 test_notifications_only_(false) {
816 DCHECK(!g_network_change_notifier); 818 DCHECK(!g_network_change_notifier);
817 g_network_change_notifier = this; 819 g_network_change_notifier = this;
818 network_change_calculator_->Init(); 820 network_change_calculator_->Init();
819 } 821 }
820 822
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 1026
1025 NetworkChangeNotifier::DisableForTest::~DisableForTest() { 1027 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
1026 DCHECK(!g_network_change_notifier); 1028 DCHECK(!g_network_change_notifier);
1027 g_network_change_notifier = network_change_notifier_; 1029 g_network_change_notifier = network_change_notifier_;
1028 } 1030 }
1029 1031
1030 void NetworkChangeNotifier::DNSObserver::OnInitialDNSConfigRead() { 1032 void NetworkChangeNotifier::DNSObserver::OnInitialDNSConfigRead() {
1031 } 1033 }
1032 1034
1033 } // namespace net 1035 } // namespace net
OLDNEW
« no previous file with comments | « net/base/network_change_notifier.h ('k') | net/base/sdch_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698