| Index: net/proxy/proxy_config_service_mac.h
|
| diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h
|
| deleted file mode 100644
|
| index 87c81622071297d2c52578870484b36b6aec22d7..0000000000000000000000000000000000000000
|
| --- a/net/proxy/proxy_config_service_mac.h
|
| +++ /dev/null
|
| @@ -1,84 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
|
| -#define NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| -#include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/observer_list.h"
|
| -#include "net/base/network_config_watcher_mac.h"
|
| -#include "net/proxy/proxy_config.h"
|
| -#include "net/proxy/proxy_config_service.h"
|
| -
|
| -namespace base {
|
| -class SingleThreadTaskRunner;
|
| -} // namespace base
|
| -
|
| -namespace net {
|
| -
|
| -class ProxyConfigServiceMac : public ProxyConfigService {
|
| - public:
|
| - // Constructs a ProxyConfigService that watches the Mac OS system settings.
|
| - // This instance is expected to be operated and deleted on the same thread
|
| - // (however it may be constructed from a different thread).
|
| - explicit ProxyConfigServiceMac(
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_task_runner);
|
| - ~ProxyConfigServiceMac() override;
|
| -
|
| - public:
|
| - // ProxyConfigService implementation:
|
| - void AddObserver(Observer* observer) override;
|
| - void RemoveObserver(Observer* observer) override;
|
| - ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override;
|
| -
|
| - private:
|
| - class Helper;
|
| -
|
| - // Forwarder just exists to keep the NetworkConfigWatcherMac API out of
|
| - // ProxyConfigServiceMac's public API.
|
| - class Forwarder : public NetworkConfigWatcherMac::Delegate {
|
| - public:
|
| - explicit Forwarder(ProxyConfigServiceMac* proxy_config_service)
|
| - : proxy_config_service_(proxy_config_service) {}
|
| -
|
| - // NetworkConfigWatcherMac::Delegate implementation:
|
| - void StartReachabilityNotifications() override {}
|
| - void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store) override;
|
| - void OnNetworkConfigChange(CFArrayRef changed_keys) override;
|
| -
|
| - private:
|
| - ProxyConfigServiceMac* const proxy_config_service_;
|
| - DISALLOW_COPY_AND_ASSIGN(Forwarder);
|
| - };
|
| -
|
| - // Methods directly called by the NetworkConfigWatcherMac::Delegate:
|
| - void SetDynamicStoreNotificationKeys(SCDynamicStoreRef store);
|
| - void OnNetworkConfigChange(CFArrayRef changed_keys);
|
| -
|
| - // Called when the proxy configuration has changed, to notify the observers.
|
| - void OnProxyConfigChanged(const ProxyConfig& new_config);
|
| -
|
| - Forwarder forwarder_;
|
| - scoped_ptr<const NetworkConfigWatcherMac> config_watcher_;
|
| -
|
| - ObserverList<Observer> observers_;
|
| -
|
| - // Holds the last system proxy settings that we fetched.
|
| - bool has_fetched_config_;
|
| - ProxyConfig last_config_fetched_;
|
| -
|
| - scoped_refptr<Helper> helper_;
|
| -
|
| - // The thread that we expect to be operated on.
|
| - const scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceMac);
|
| -};
|
| -
|
| -} // namespace net
|
| -
|
| -#endif // NET_PROXY_PROXY_CONFIG_SERVICE_MAC_H_
|
|
|