| 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_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" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/observer_list.h" | 12 #include "base/observer_list.h" |
| 13 #include "net/base/network_config_watcher_mac.h" | 13 #include "net/base/network_config_watcher_mac.h" |
| 14 #include "net/proxy/proxy_config.h" | 14 #include "net/proxy/proxy_config.h" |
| 15 #include "net/proxy/proxy_config_service.h" | 15 #include "net/proxy/proxy_config_service.h" |
| 16 | 16 |
| 17 namespace base { | 17 namespace base { |
| 18 class SingleThreadTaskRunner; | 18 class SingleThreadTaskRunner; |
| 19 } // namespace base | 19 } // namespace base |
| 20 | 20 |
| 21 namespace net { | 21 namespace net { |
| 22 | 22 |
| 23 // TODO(sergeyu): This class needs to be exported because remoting code | 23 class ProxyConfigServiceMac : public ProxyConfigService { |
| 24 // creates it directly. Fix that and remove NET_EXPORT here. | |
| 25 // crbug.com/125104 | |
| 26 class NET_EXPORT ProxyConfigServiceMac : public ProxyConfigService { | |
| 27 public: | 24 public: |
| 28 // Constructs a ProxyConfigService that watches the Mac OS system settings. | 25 // Constructs a ProxyConfigService that watches the Mac OS system settings. |
| 29 // 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 |
| 30 // (however it may be constructed from a different thread). | 27 // (however it may be constructed from a different thread). |
| 31 explicit ProxyConfigServiceMac( | 28 explicit ProxyConfigServiceMac( |
| 32 const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_task_runner); | 29 const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_task_runner); |
| 33 virtual ~ProxyConfigServiceMac(); | 30 virtual ~ProxyConfigServiceMac(); |
| 34 | 31 |
| 35 public: | 32 public: |
| 36 // ProxyConfigService implementation: | 33 // ProxyConfigService implementation: |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 76 |
| 80 // The thread that we expect to be operated on. | 77 // The thread that we expect to be operated on. |
| 81 const scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_; | 78 const scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_; |
| 82 | 79 |
| 83 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac); | 80 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac); |
| 84 }; | 81 }; |
| 85 | 82 |
| 86 } // namespace net | 83 } // namespace net |
| 87 | 84 |
| 88 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_ | 85 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_ |
| OLD | NEW |