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

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

Issue 7737034: Revert 99677 (didn't help) - Revert 99666 (sync tests started failing on mac10.6: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « net/base/network_change_notifier.h ('k') | net/base/network_change_notifier_linux.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 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "net/base/network_change_notifier_factory.h" 6 #include "net/base/network_change_notifier_factory.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include "net/base/network_change_notifier_win.h" 9 #include "net/base/network_change_notifier_win.h"
10 #elif defined(OS_LINUX) || defined(OS_ANDROID) 10 #elif defined(OS_LINUX) || defined(OS_ANDROID)
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 84
85 void NetworkChangeNotifier::AddOnlineStateObserver( 85 void NetworkChangeNotifier::AddOnlineStateObserver(
86 OnlineStateObserver* observer) { 86 OnlineStateObserver* observer) {
87 if (g_network_change_notifier) { 87 if (g_network_change_notifier) {
88 g_network_change_notifier->online_state_observer_list_->AddObserver( 88 g_network_change_notifier->online_state_observer_list_->AddObserver(
89 observer); 89 observer);
90 } 90 }
91 } 91 }
92 92
93 void NetworkChangeNotifier::AddDNSObserver(DNSObserver* observer) {
94 if (g_network_change_notifier) {
95 g_network_change_notifier->resolver_state_observer_list_->AddObserver(
96 observer);
97 }
98 }
99
93 void NetworkChangeNotifier::RemoveIPAddressObserver( 100 void NetworkChangeNotifier::RemoveIPAddressObserver(
94 IPAddressObserver* observer) { 101 IPAddressObserver* observer) {
95 if (g_network_change_notifier) { 102 if (g_network_change_notifier) {
96 g_network_change_notifier->ip_address_observer_list_->RemoveObserver( 103 g_network_change_notifier->ip_address_observer_list_->RemoveObserver(
97 observer); 104 observer);
98 } 105 }
99 } 106 }
100 107
101 void NetworkChangeNotifier::RemoveOnlineStateObserver( 108 void NetworkChangeNotifier::RemoveOnlineStateObserver(
102 OnlineStateObserver* observer) { 109 OnlineStateObserver* observer) {
103 if (g_network_change_notifier) { 110 if (g_network_change_notifier) {
104 g_network_change_notifier->online_state_observer_list_->RemoveObserver( 111 g_network_change_notifier->online_state_observer_list_->RemoveObserver(
105 observer); 112 observer);
106 } 113 }
107 } 114 }
108 115
116 void NetworkChangeNotifier::RemoveDNSObserver(DNSObserver* observer) {
117 if (g_network_change_notifier) {
118 g_network_change_notifier->resolver_state_observer_list_->RemoveObserver(
119 observer);
120 }
121 }
122
109 NetworkChangeNotifier::NetworkChangeNotifier() 123 NetworkChangeNotifier::NetworkChangeNotifier()
110 : ip_address_observer_list_( 124 : ip_address_observer_list_(
111 new ObserverListThreadSafe<IPAddressObserver>( 125 new ObserverListThreadSafe<IPAddressObserver>(
112 ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)), 126 ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
113 online_state_observer_list_( 127 online_state_observer_list_(
114 new ObserverListThreadSafe<OnlineStateObserver>( 128 new ObserverListThreadSafe<OnlineStateObserver>(
115 ObserverListBase<OnlineStateObserver>::NOTIFY_EXISTING_ONLY)) { 129 ObserverListBase<OnlineStateObserver>::NOTIFY_EXISTING_ONLY)),
130 resolver_state_observer_list_(
131 new ObserverListThreadSafe<DNSObserver>(
132 ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)) {
116 DCHECK(!g_network_change_notifier); 133 DCHECK(!g_network_change_notifier);
117 g_network_change_notifier = this; 134 g_network_change_notifier = this;
118 } 135 }
119 136
120 void NetworkChangeNotifier::NotifyObserversOfIPAddressChange() { 137 void NetworkChangeNotifier::NotifyObserversOfIPAddressChange() {
121 if (g_network_change_notifier) { 138 if (g_network_change_notifier) {
122 g_network_change_notifier->ip_address_observer_list_->Notify( 139 g_network_change_notifier->ip_address_observer_list_->Notify(
123 &IPAddressObserver::OnIPAddressChanged); 140 &IPAddressObserver::OnIPAddressChanged);
124 } 141 }
125 } 142 }
126 143
144 void NetworkChangeNotifier::NotifyObserversOfDNSChange() {
145 if (g_network_change_notifier) {
146 g_network_change_notifier->resolver_state_observer_list_->Notify(
147 &DNSObserver::OnDNSChanged);
148 }
149 }
150
127 void NetworkChangeNotifier::NotifyObserversOfOnlineStateChange() { 151 void NetworkChangeNotifier::NotifyObserversOfOnlineStateChange() {
128 if (g_network_change_notifier) { 152 if (g_network_change_notifier) {
129 g_network_change_notifier->online_state_observer_list_->Notify( 153 g_network_change_notifier->online_state_observer_list_->Notify(
130 &OnlineStateObserver::OnOnlineStateChanged, !IsOffline()); 154 &OnlineStateObserver::OnOnlineStateChanged, !IsOffline());
131 } 155 }
132 } 156 }
133 157
134 } // namespace net 158 } // namespace net
OLDNEW
« no previous file with comments | « net/base/network_change_notifier.h ('k') | net/base/network_change_notifier_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698