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

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

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/base/keygen_handler_mac.cc ('k') | net/base/network_change_notifier_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void* notifier); 60 void* notifier);
61 61
62 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsMac(); 62 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsMac();
63 63
64 // These must be constructed before config_watcher_ to ensure 64 // These must be constructed before config_watcher_ to ensure
65 // 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.
66 ConnectionType connection_type_; 66 ConnectionType connection_type_;
67 bool connection_type_initialized_; 67 bool connection_type_initialized_;
68 mutable base::Lock connection_type_lock_; 68 mutable base::Lock connection_type_lock_;
69 mutable base::ConditionVariable initial_connection_type_cv_; 69 mutable base::ConditionVariable initial_connection_type_cv_;
70 base::mac::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_; 70 base::ScopedCFTypeRef<SCNetworkReachabilityRef> reachability_;
71 base::mac::ScopedCFTypeRef<CFRunLoopRef> run_loop_; 71 base::ScopedCFTypeRef<CFRunLoopRef> run_loop_;
72 72
73 Forwarder forwarder_; 73 Forwarder forwarder_;
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_
OLDNEW
« no previous file with comments | « net/base/keygen_handler_mac.cc ('k') | net/base/network_change_notifier_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698