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 #include <fcntl.h> | 8 #include <fcntl.h> |
9 #if defined(USE_GCONF) | 9 #if defined(USE_GCONF) |
10 #include <gconf/gconf-client.h> | 10 #include <gconf/gconf-client.h> |
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
877 // the gconf version, that is the only thread that can access the proxy | 877 // the gconf version, that is the only thread that can access the proxy |
878 // settings (a gconf restriction). As noted below, the initial read of | 878 // settings (a gconf restriction). As noted below, the initial read of |
879 // the proxy settings will be done in this thread anyway, so we check | 879 // the proxy settings will be done in this thread anyway, so we check |
880 // for .kde4 here in this thread as well. | 880 // for .kde4 here in this thread as well. |
881 base::FilePath kde3_path = base::FilePath(home).Append(".kde"); | 881 base::FilePath kde3_path = base::FilePath(home).Append(".kde"); |
882 base::FilePath kde3_config = KDEHomeToConfigPath(kde3_path); | 882 base::FilePath kde3_config = KDEHomeToConfigPath(kde3_path); |
883 base::FilePath kde4_path = base::FilePath(home).Append(".kde4"); | 883 base::FilePath kde4_path = base::FilePath(home).Append(".kde4"); |
884 base::FilePath kde4_config = KDEHomeToConfigPath(kde4_path); | 884 base::FilePath kde4_config = KDEHomeToConfigPath(kde4_path); |
885 bool use_kde4 = false; | 885 bool use_kde4 = false; |
886 if (base::DirectoryExists(kde4_path)) { | 886 if (base::DirectoryExists(kde4_path)) { |
887 base::PlatformFileInfo kde3_info; | 887 base::File::Info kde3_info; |
888 base::PlatformFileInfo kde4_info; | 888 base::File::Info kde4_info; |
889 if (base::GetFileInfo(kde4_config, &kde4_info)) { | 889 if (base::GetFileInfo(kde4_config, &kde4_info)) { |
890 if (base::GetFileInfo(kde3_config, &kde3_info)) { | 890 if (base::GetFileInfo(kde3_config, &kde3_info)) { |
891 use_kde4 = kde4_info.last_modified >= kde3_info.last_modified; | 891 use_kde4 = kde4_info.last_modified >= kde3_info.last_modified; |
892 } else { | 892 } else { |
893 use_kde4 = true; | 893 use_kde4 = true; |
894 } | 894 } |
895 } | 895 } |
896 } | 896 } |
897 if (use_kde4) { | 897 if (use_kde4) { |
898 kde_config_dir_ = KDEHomeToConfigPath(kde4_path); | 898 kde_config_dir_ = KDEHomeToConfigPath(kde4_path); |
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1757 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { | 1757 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { |
1758 delegate_->RemoveObserver(observer); | 1758 delegate_->RemoveObserver(observer); |
1759 } | 1759 } |
1760 | 1760 |
1761 ProxyConfigService::ConfigAvailability | 1761 ProxyConfigService::ConfigAvailability |
1762 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { | 1762 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { |
1763 return delegate_->GetLatestProxyConfig(config); | 1763 return delegate_->GetLatestProxyConfig(config); |
1764 } | 1764 } |
1765 | 1765 |
1766 } // namespace net | 1766 } // namespace net |
OLD | NEW |