diff options
| author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 00:36:39 +0000 |
|---|---|---|
| committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-05 00:36:39 +0000 |
| commit | 66a5940fbfc857691cef0cac9e201f6b3414007d (patch) | |
| tree | 67b3c03d201dccababf08f31c24ac8fdd414b764 /net/dns | |
| parent | ef442aa72df5c6fcd3da8921e365098f1b39f492 (diff) | |
| download | chromium_src-66a5940fbfc857691cef0cac9e201f6b3414007d.zip chromium_src-66a5940fbfc857691cef0cac9e201f6b3414007d.tar.gz chromium_src-66a5940fbfc857691cef0cac9e201f6b3414007d.tar.bz2 | |
(1) Added a recursive boolean param to FilePathWatcher::Watch() function to watch for sub directory tree changes. Fixed all the calling sites.
(2) Added support to watch sub trees on Windows.
(3) Added FilePathWatcherTest.RecursiveWatch browser test.
BUG=144491
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11415066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_config_service_posix.cc | 4 | ||||
| -rw-r--r-- | net/dns/dns_config_service_win.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index db93418..7e8a75b 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc @@ -59,7 +59,7 @@ class ConfigWatcher { bool Watch(const CallbackType& callback) { callback_ = callback; - return watcher_.Watch(FilePath(kFilePathConfig), + return watcher_.Watch(FilePath(kFilePathConfig), false, base::Bind(&ConfigWatcher::OnCallback, base::Unretained(this))); } @@ -120,7 +120,7 @@ class DnsConfigServicePosix::Watcher { LOG(ERROR) << "DNS config watch failed to start."; success = false; } - if (!hosts_watcher_.Watch(FilePath(kFilePathHosts), + if (!hosts_watcher_.Watch(FilePath(kFilePathHosts), false, base::Bind(&Watcher::OnHostsChanged, base::Unretained(this)))) { LOG(ERROR) << "DNS hosts watch failed to start."; diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index 1e4f153..6e6496d 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -529,7 +529,7 @@ class DnsConfigServiceWin::Watcher dnscache_watcher_.Watch(kDnscachePath, callback); policy_watcher_.Watch(kPolicyPath, callback); - if (!hosts_watcher_.Watch(GetHostsPath(), + if (!hosts_watcher_.Watch(GetHostsPath(), false, base::Bind(&Watcher::OnHostsChanged, base::Unretained(this)))) { LOG(ERROR) << "DNS hosts watch failed to start."; @@ -703,4 +703,3 @@ scoped_ptr<DnsConfigService> DnsConfigService::CreateSystemService() { } } // namespace net - |