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

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

Issue 367113004: Move GLIB_DISABLE_DEPRECATION_WARNINGS define to a more general place. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated Created 6 years, 4 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
« no previous file with comments | « build/linux/system.gyp ('k') | 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 // glib >=2.40 deprecate g_settings_list_schemas in favor of
8 // g_settings_schema_source_list_schemas. This function is not available on
9 // earlier versions that we still need to support (specifically, 2.32), so
10 // disable the warning.
11 // TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10
12 // (saucy) and earlier. Update the code to use
13 // g_settings_schema_source_list_schemas instead.
14 #define GLIB_DISABLE_DEPRECATION_WARNINGS
15
16 #include <errno.h> 7 #include <errno.h>
17 #include <fcntl.h> 8 #include <fcntl.h>
18 #if defined(USE_GCONF) 9 #if defined(USE_GCONF)
19 #include <gconf/gconf-client.h> 10 #include <gconf/gconf-client.h>
20 #endif // defined(USE_GCONF) 11 #endif // defined(USE_GCONF)
21 #include <limits.h> 12 #include <limits.h>
22 #include <stdio.h> 13 #include <stdio.h>
23 #include <stdlib.h> 14 #include <stdlib.h>
24 #include <sys/inotify.h> 15 #include <sys/inotify.h>
25 #include <unistd.h> 16 #include <unistd.h>
(...skipping 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) { 1764 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) {
1774 delegate_->RemoveObserver(observer); 1765 delegate_->RemoveObserver(observer);
1775 } 1766 }
1776 1767
1777 ProxyConfigService::ConfigAvailability 1768 ProxyConfigService::ConfigAvailability
1778 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) { 1769 ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) {
1779 return delegate_->GetLatestProxyConfig(config); 1770 return delegate_->GetLatestProxyConfig(config);
1780 } 1771 }
1781 1772
1782 } // namespace net 1773 } // namespace net
OLDNEW
« no previous file with comments | « build/linux/system.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698