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

Side by Side Diff: net/proxy/proxy_config_service_linux.cc

Issue 267623002: Fix Trusty build with clang. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 #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 21 matching lines...) Expand all
32 #include "base/strings/string_util.h" 32 #include "base/strings/string_util.h"
33 #include "base/threading/thread_restrictions.h" 33 #include "base/threading/thread_restrictions.h"
34 #include "base/timer/timer.h" 34 #include "base/timer/timer.h"
35 #include "net/base/net_errors.h" 35 #include "net/base/net_errors.h"
36 #include "net/http/http_util.h" 36 #include "net/http/http_util.h"
37 #include "net/proxy/proxy_config.h" 37 #include "net/proxy/proxy_config.h"
38 #include "net/proxy/proxy_server.h" 38 #include "net/proxy/proxy_server.h"
39 #include "url/url_canon.h" 39 #include "url/url_canon.h"
40 40
41 #if defined(USE_GIO) 41 #if defined(USE_GIO)
42 #if __clang__
43 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
44 #endif
42 #include "library_loaders/libgio.h" 45 #include "library_loaders/libgio.h"
43 #endif // defined(USE_GIO) 46 #endif // defined(USE_GIO)
44 47
45 namespace net { 48 namespace net {
46 49
47 namespace { 50 namespace {
48 51
49 // Given a proxy hostname from a setting, returns that hostname with 52 // Given a proxy hostname from a setting, returns that hostname with
50 // an appropriate proxy server scheme prefix. 53 // an appropriate proxy server scheme prefix.
51 // scheme indicates the desired proxy scheme: usually http, with 54 // scheme indicates the desired proxy scheme: usually http, with
(...skipping 1706 matching lines...) Expand 10 before | Expand all | Expand 10 after
1758 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { 1761 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) {
1759 delegate_->RemoveObserver(observer); 1762 delegate_->RemoveObserver(observer);
1760 } 1763 }
1761 1764
1762 ProxyConfigService::ConfigAvailability 1765 ProxyConfigService::ConfigAvailability
1763 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { 1766 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) {
1764 return delegate_->GetLatestProxyConfig(config); 1767 return delegate_->GetLatestProxyConfig(config);
1765 } 1768 }
1766 1769
1767 } // namespace net 1770 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698