| OLD | NEW |
| 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 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ | 5 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ |
| 6 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ | 6 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ |
| 7 | 7 |
| 8 #include <SystemConfiguration/SystemConfiguration.h> | 8 #include <SystemConfiguration/SystemConfiguration.h> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/mac/scoped_cftyperef.h" | 12 #include "base/mac/scoped_cftyperef.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/synchronization/condition_variable.h" | 14 #include "base/synchronization/condition_variable.h" |
| 15 #include "base/synchronization/lock.h" | 15 #include "base/synchronization/lock.h" |
| 16 #include "net/base/network_change_notifier.h" | 16 #include "net/base/network_change_notifier.h" |
| 17 #include "net/base/network_config_watcher_mac.h" | 17 #include "net/base/network_config_watcher_mac.h" |
| 18 | 18 |
| 19 namespace net { | 19 namespace net { |
| 20 | 20 |
| 21 class NetworkChangeNotifierMac: public NetworkChangeNotifier { | 21 class NetworkChangeNotifierMac: public NetworkChangeNotifier { |
| 22 public: | 22 public: |
| 23 NetworkChangeNotifierMac(); | 23 NetworkChangeNotifierMac(); |
| 24 virtual ~NetworkChangeNotifierMac(); | 24 virtual ~NetworkChangeNotifierMac(); |
| 25 | 25 |
| 26 // NetworkChangeNotifier implementation: | 26 // NetworkChangeNotifier implementation: |
| 27 virtual ConnectionType GetCurrentConnectionType() const OVERRIDE; | 27 virtual ConnectionType GetCurrentConnectionType() const override; |
| 28 | 28 |
| 29 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of | 29 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of |
| 30 // NetworkChangeNotifierMac's public API. | 30 // NetworkChangeNotifierMac's public API. |
| 31 class Forwarder : public NetworkConfigWatcherMac::Delegate { | 31 class Forwarder : public NetworkConfigWatcherMac::Delegate { |
| 32 public: | 32 public: |
| 33 explicit Forwarder(NetworkChangeNotifierMac* net_config_watcher) | 33 explicit Forwarder(NetworkChangeNotifierMac* net_config_watcher) |
| 34 : net_config_watcher_(net_config_watcher) {} | 34 : net_config_watcher_(net_config_watcher) {} |
| 35 | 35 |
| 36 // NetworkConfigWatcherMac::Delegate implementation: | 36 // NetworkConfigWatcherMac::Delegate implementation: |
| 37 virtual void Init() OVERRIDE; | 37 virtual void Init() override; |
| 38 virtual void StartReachabilityNotifications() OVERRIDE; | 38 virtual void StartReachabilityNotifications() override; |
| 39 virtual void SetDynamicStoreNotificationKeys( | 39 virtual void SetDynamicStoreNotificationKeys( |
| 40 SCDynamicStoreRef store) OVERRIDE; | 40 SCDynamicStoreRef store) override; |
| 41 virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE; | 41 virtual void OnNetworkConfigChange(CFArrayRef changed_keys) override; |
| 42 | 42 |
| 43 private: | 43 private: |
| 44 NetworkChangeNotifierMac* const net_config_watcher_; | 44 NetworkChangeNotifierMac* const net_config_watcher_; |
| 45 DISALLOW_COPY_AND_ASSIGN(Forwarder); | 45 DISALLOW_COPY_AND_ASSIGN(Forwarder); |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 private: | 48 private: |
| 49 class DnsConfigServiceThread; | 49 class DnsConfigServiceThread; |
| 50 | 50 |
| 51 // Methods directly called by the NetworkConfigWatcherMac::Delegate: | 51 // Methods directly called by the NetworkConfigWatcherMac::Delegate: |
| (...skipping 22 matching lines...) Expand all Loading... |
| 74 scoped_ptr<const NetworkConfigWatcherMac> config_watcher_; | 74 scoped_ptr<const NetworkConfigWatcherMac> config_watcher_; |
| 75 | 75 |
| 76 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_; | 76 scoped_ptr<DnsConfigServiceThread> dns_config_service_thread_; |
| 77 | 77 |
| 78 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac); | 78 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac); |
| 79 }; | 79 }; |
| 80 | 80 |
| 81 } // namespace net | 81 } // namespace net |
| 82 | 82 |
| 83 #endif // NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ | 83 #endif // NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ |
| OLD | NEW |