diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /net/base/network_change_notifier_mac.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'net/base/network_change_notifier_mac.cc')
| -rw-r--r-- | net/base/network_change_notifier_mac.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/net/base/network_change_notifier_mac.cc b/net/base/network_change_notifier_mac.cc index d07a15c..7521c90 100644 --- a/net/base/network_change_notifier_mac.cc +++ b/net/base/network_change_notifier_mac.cc @@ -7,6 +7,8 @@ #include <SystemConfiguration/SCDynamicStoreKey.h> #include <SystemConfiguration/SCSchemaDefinitions.h> +#include "base/mac/scoped_cftyperef.h" + namespace net { NetworkChangeNotifierMac::NetworkChangeNotifierMac() @@ -14,13 +16,19 @@ NetworkChangeNotifierMac::NetworkChangeNotifierMac() config_watcher_(&forwarder_) {} NetworkChangeNotifierMac::~NetworkChangeNotifierMac() {} +bool NetworkChangeNotifierMac::IsCurrentlyOffline() const { + // TODO(eroman): http://crbug.com/53473 + return false; +} + void NetworkChangeNotifierMac::SetDynamicStoreNotificationKeys( SCDynamicStoreRef store) { // Called on notifier thread. - scoped_cftyperef<CFMutableArrayRef> notification_keys( + base::mac::ScopedCFTypeRef<CFMutableArrayRef> notification_keys( CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks)); - scoped_cftyperef<CFStringRef> key(SCDynamicStoreKeyCreateNetworkGlobalEntity( - NULL, kSCDynamicStoreDomainState, kSCEntNetInterface)); + base::mac::ScopedCFTypeRef<CFStringRef> key( + SCDynamicStoreKeyCreateNetworkGlobalEntity( + NULL, kSCDynamicStoreDomainState, kSCEntNetInterface)); CFArrayAppendValue(notification_keys.get(), key.get()); key.reset(SCDynamicStoreKeyCreateNetworkGlobalEntity( NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4)); |