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

Side by Side Diff: net/proxy/proxy_config_service_mac.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 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
« no previous file with comments | « net/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_config_service_win.h » ('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_PROXY_PROXY_CONFIG_SERVICE_MAC_H_ 5 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
6 #define NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_ 6 #define NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 13 matching lines...) Expand all
24 public: 24 public:
25 // Constructs a ProxyConfigService that watches the Mac OS system settings. 25 // Constructs a ProxyConfigService that watches the Mac OS system settings.
26 // This instance is expected to be operated and deleted on the same thread 26 // This instance is expected to be operated and deleted on the same thread
27 // (however it may be constructed from a different thread). 27 // (however it may be constructed from a different thread).
28 explicit ProxyConfigServiceMac( 28 explicit ProxyConfigServiceMac(
29 const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_task_runner); 29 const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_task_runner);
30 virtual ~ProxyConfigServiceMac(); 30 virtual ~ProxyConfigServiceMac();
31 31
32 public: 32 public:
33 // ProxyConfigService implementation: 33 // ProxyConfigService implementation:
34 virtual void AddObserver(Observer* observer) OVERRIDE; 34 virtual void AddObserver(Observer* observer) override;
35 virtual void RemoveObserver(Observer* observer) OVERRIDE; 35 virtual void RemoveObserver(Observer* observer) override;
36 virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; 36 virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override;
37 37
38 private: 38 private:
39 class Helper; 39 class Helper;
40 40
41 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of 41 // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
42 // ProxyConfigServiceMac's public API. 42 // ProxyConfigServiceMac's public API.
43 class Forwarder : public NetworkConfigWatcherMac::Delegate { 43 class Forwarder : public NetworkConfigWatcherMac::Delegate {
44 public: 44 public:
45 explicit Forwarder(ProxyConfigServiceMac* proxy_config_service) 45 explicit Forwarder(ProxyConfigServiceMac* proxy_config_service)
46 : proxy_config_service_(proxy_config_service) {} 46 : proxy_config_service_(proxy_config_service) {}
47 47
48 // NetworkConfigWatcherMac::Delegate implementation: 48 // NetworkConfigWatcherMac::Delegate implementation:
49 virtual void StartReachabilityNotifications() OVERRIDE {} 49 virtual void StartReachabilityNotifications() override {}
50 virtual void SetDynamicStoreNotificationKeys( 50 virtual void SetDynamicStoreNotificationKeys(
51 SCDynamicStoreRef store) OVERRIDE; 51 SCDynamicStoreRef store) override;
52 virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE; 52 virtual void OnNetworkConfigChange(CFArrayRef changed_keys) override;
53 53
54 private: 54 private:
55 ProxyConfigServiceMac* const proxy_config_service_; 55 ProxyConfigServiceMac* const proxy_config_service_;
56 DISALLOW_COPY_AND_ASSIGN(Forwarder); 56 DISALLOW_COPY_AND_ASSIGN(Forwarder);
57 }; 57 };
58 58
59 // Methods directly called by the NetworkConfigWatcherMac::Delegate: 59 // Methods directly called by the NetworkConfigWatcherMac::Delegate:
60 void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store); 60 void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
61 void OnNetworkConfigChange(CFArrayRef changed_keys); 61 void OnNetworkConfigChange(CFArrayRef changed_keys);
62 62
(...skipping 13 matching lines...) Expand all
76 76
77 // The thread that we expect to be operated on. 77 // The thread that we expect to be operated on.
78 const scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_; 78 const scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac); 80 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac);
81 }; 81 };
82 82
83 } // namespace net 83 } // namespace net
84 84
85 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_ 85 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
OLDNEW
« no previous file with comments | « net/proxy/proxy_config_service_linux_unittest.cc ('k') | net/proxy/proxy_config_service_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698