| Index: net/base/network_change_notifier_mac.h
|
| diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
|
| index ec2bb1fed50e97c42be5bf424f01e8e9117f9546..320cff9f5c0116ade3ce6586da203594e7db3d70 100644
|
| --- a/net/base/network_change_notifier_mac.h
|
| +++ b/net/base/network_change_notifier_mac.h
|
| @@ -25,14 +25,7 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
|
| virtual ~NetworkChangeNotifierMac();
|
|
|
| // NetworkChangeNotifier implementation:
|
| - virtual bool IsCurrentlyOffline() const OVERRIDE;
|
| -
|
| - private:
|
| - enum OnlineState {
|
| - UNINITIALIZED = -1,
|
| - OFFLINE = 0,
|
| - ONLINE = 1
|
| - };
|
| + virtual ConnectionType GetCurrentConnectionType() const OVERRIDE;
|
|
|
| // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
|
| // NetworkChangeNotifierMac's public API.
|
| @@ -74,8 +67,9 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
|
|
|
| // These must be constructed before config_watcher_ to ensure
|
| // the lock is in a valid state when Forwarder::Init is called.
|
| - OnlineState online_state_;
|
| - mutable base::Lock online_state_lock_;
|
| + ConnectionType connection_type_;
|
| + bool connection_type_initialized_;
|
| + mutable base::Lock connection_type_lock_;
|
| mutable base::ConditionVariable initial_state_cv_;
|
| base::mac::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_;
|
| base::mac::ScopedCFTypeRef<CFRunLoopRef> run_loop_;
|
|
|