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 #include "net/proxy/proxy_config_service_linux.h" | 5 #include "net/proxy/proxy_config_service_linux.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #if defined(USE_GCONF) | 8 #if defined(USE_GCONF) |
9 #include <gconf/gconf-client.h> | 9 #include <gconf/gconf-client.h> |
10 #endif // defined(USE_GCONF) | 10 #endif // defined(USE_GCONF) |
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 #endif // defined(USE_GIO) | 856 #endif // defined(USE_GIO) |
857 | 857 |
858 // This is the KDE version that reads kioslaverc and simulates gconf. | 858 // This is the KDE version that reads kioslaverc and simulates gconf. |
859 // Doing this allows the main Delegate code, as well as the unit tests | 859 // Doing this allows the main Delegate code, as well as the unit tests |
860 // for it, to stay the same - and the settings map fairly well besides. | 860 // for it, to stay the same - and the settings map fairly well besides. |
861 class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, | 861 class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, |
862 public base::MessagePumpLibevent::Watcher { | 862 public base::MessagePumpLibevent::Watcher { |
863 public: | 863 public: |
864 explicit SettingGetterImplKDE(base::Environment* env_var_getter) | 864 explicit SettingGetterImplKDE(base::Environment* env_var_getter) |
865 : inotify_fd_(-1), | 865 : inotify_fd_(-1), |
| 866 inotify_watcher_(FROM_HERE), |
866 notify_delegate_(nullptr), | 867 notify_delegate_(nullptr), |
867 debounce_timer_(new base::OneShotTimer()), | 868 debounce_timer_(new base::OneShotTimer()), |
868 indirect_manual_(false), | 869 indirect_manual_(false), |
869 auto_no_pac_(false), | 870 auto_no_pac_(false), |
870 reversed_bypass_list_(false), | 871 reversed_bypass_list_(false), |
871 env_var_getter_(env_var_getter), | 872 env_var_getter_(env_var_getter), |
872 file_task_runner_(nullptr) { | 873 file_task_runner_(nullptr) { |
873 // This has to be called on the UI thread (http://crbug.com/69057). | 874 // This has to be called on the UI thread (http://crbug.com/69057). |
874 base::ThreadRestrictions::ScopedAllowIO allow_io; | 875 base::ThreadRestrictions::ScopedAllowIO allow_io; |
875 | 876 |
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1781 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { | 1782 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { |
1782 delegate_->RemoveObserver(observer); | 1783 delegate_->RemoveObserver(observer); |
1783 } | 1784 } |
1784 | 1785 |
1785 ProxyConfigService::ConfigAvailability | 1786 ProxyConfigService::ConfigAvailability |
1786 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { | 1787 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { |
1787 return delegate_->GetLatestProxyConfig(config); | 1788 return delegate_->GetLatestProxyConfig(config); |
1788 } | 1789 } |
1789 | 1790 |
1790 } // namespace net | 1791 } // namespace net |
OLD | NEW |