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

Side by Side Diff: net/base/network_change_notifier_mac.h

Issue 9147026: API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <SystemConfiguration/SystemConfiguration.h> 9 #include <SystemConfiguration/SystemConfiguration.h>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/mac/scoped_cftyperef.h" 13 #include "base/mac/scoped_cftyperef.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/synchronization/condition_variable.h" 15 #include "base/synchronization/condition_variable.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "net/base/network_change_notifier.h" 17 #include "net/base/network_change_notifier.h"
18 #include "net/base/network_config_watcher_mac.h" 18 #include "net/base/network_config_watcher_mac.h"
19 19
20 namespace net { 20 namespace net {
21 21
22 class NetworkChangeNotifierMac: public NetworkChangeNotifier { 22 class NetworkChangeNotifierMac: public NetworkChangeNotifier {
23 public: 23 public:
24 NetworkChangeNotifierMac(); 24 NetworkChangeNotifierMac();
25 virtual ~NetworkChangeNotifierMac(); 25 virtual ~NetworkChangeNotifierMac();
26 26
27 // NetworkChangeNotifier implementation: 27 // NetworkChangeNotifier implementation:
28 virtual bool IsCurrentlyOffline() const OVERRIDE; 28 virtual ConnectionState GetCurrentConnectionState() const OVERRIDE;
29
30 private:
31 enum OnlineState {
32 UNINITIALIZED = -1,
33 OFFLINE = 0,
34 ONLINE = 1
35 };
36 29
37 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of 30 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
38 // NetworkChangeNotifierMac's public API. 31 // NetworkChangeNotifierMac's public API.
39 class Forwarder : public NetworkConfigWatcherMac::Delegate { 32 class Forwarder : public NetworkConfigWatcherMac::Delegate {
40 public: 33 public:
41 explicit Forwarder(NetworkChangeNotifierMac* net_config_watcher) 34 explicit Forwarder(NetworkChangeNotifierMac* net_config_watcher)
42 : net_config_watcher_(net_config_watcher) {} 35 : net_config_watcher_(net_config_watcher) {}
43 36
44 // NetworkConfigWatcherMac::Delegate implementation: 37 // NetworkConfigWatcherMac::Delegate implementation:
45 virtual void Init() OVERRIDE { 38 virtual void Init() OVERRIDE {
(...skipping 17 matching lines...) Expand all
63 void OnNetworkConfigChange(CFArrayRef changed_keys); 56 void OnNetworkConfigChange(CFArrayRef changed_keys);
64 57
65 void SetInitialState(); 58 void SetInitialState();
66 59
67 static void ReachabilityCallback(SCNetworkReachabilityRef target, 60 static void ReachabilityCallback(SCNetworkReachabilityRef target,
68 SCNetworkConnectionFlags flags, 61 SCNetworkConnectionFlags flags,
69 void* notifier); 62 void* notifier);
70 63
71 // These must be constructed before config_watcher_ to ensure 64 // These must be constructed before config_watcher_ to ensure
72 // the lock is in a valid state when Forwarder::Init is called. 65 // the lock is in a valid state when Forwarder::Init is called.
73 OnlineState online_state_; 66 ConnectionState connection_state_;
74 mutable base::Lock online_state_lock_; 67 mutable base::Lock connection_state_lock_;
75 mutable base::ConditionVariable initial_state_cv_; 68 mutable base::ConditionVariable initial_state_cv_;
76 base::mac::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_; 69 base::mac::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_;
77 base::mac::ScopedCFTypeRef<CFRunLoopRef> run_loop_; 70 base::mac::ScopedCFTypeRef<CFRunLoopRef> run_loop_;
78 71
79 Forwarder forwarder_; 72 Forwarder forwarder_;
80 scoped_ptr<const NetworkConfigWatcherMac> config_watcher_; 73 scoped_ptr<const NetworkConfigWatcherMac> config_watcher_;
81 74
82 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac); 75 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierMac);
83 }; 76 };
84 77
85 } // namespace net 78 } // namespace net
86 79
87 #endif // NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_ 80 #endif // NET_BASE_NETWORK_CHANGE_NOTIFIER_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698