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

Unified Diff: net/dns/dns_config_service.cc

Issue 10873018: [net] Move DnsConfigService to NetworkChangeNotifier. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comments Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: net/dns/dns_config_service.cc
diff --git a/net/dns/dns_config_service.cc b/net/dns/dns_config_service.cc
index 2291b4ebb061d72fcc3b6021e92c9e5d20d3bfed..ed3d0df8419654a1d144bb6b60dded129a329fbf 100644
--- a/net/dns/dns_config_service.cc
+++ b/net/dns/dns_config_service.cc
@@ -81,27 +81,23 @@ DnsConfigService::DnsConfigService()
last_sent_empty_(true) {}
DnsConfigService::~DnsConfigService() {
- // Must always clean up.
- NetworkChangeNotifier::RemoveDNSObserver(this);
}
-void DnsConfigService::Read(const CallbackType& callback) {
+void DnsConfigService::ReadConfig(const CallbackType& callback) {
DCHECK(CalledOnValidThread());
DCHECK(!callback.is_null());
DCHECK(callback_.is_null());
callback_ = callback;
- OnDNSChanged(NetworkChangeNotifier::CHANGE_DNS_WATCH_STARTED);
+ ReadNow();
}
-void DnsConfigService::Watch(const CallbackType& callback) {
+void DnsConfigService::WatchConfig(const CallbackType& callback) {
DCHECK(CalledOnValidThread());
DCHECK(!callback.is_null());
DCHECK(callback_.is_null());
- NetworkChangeNotifier::AddDNSObserver(this);
callback_ = callback;
- if (NetworkChangeNotifier::IsWatchingDNS())
- OnDNSChanged(NetworkChangeNotifier::CHANGE_DNS_WATCH_STARTED);
- // else: Wait until signal before reading.
+ StartWatching();
+ ReadNow();
}
void DnsConfigService::InvalidateConfig() {

Powered by Google App Engine
This is Rietveld 408576698