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

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

Issue 1844793007: Remove "#pragma comment(lib" in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « net/proxy/dhcp_proxy_script_fetcher_win.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | 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_win.h" 5 #include "net/proxy/proxy_config_service_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <winhttp.h> 8 #include <winhttp.h>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/strings/string_tokenizer.h" 15 #include "base/strings/string_tokenizer.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
19 #include "base/win/registry.h" 19 #include "base/win/registry.h"
20 #include "base/win/scoped_handle.h" 20 #include "base/win/scoped_handle.h"
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/proxy/proxy_config.h" 22 #include "net/proxy/proxy_config.h"
23 23
24 #pragma comment(lib, "winhttp.lib")
25
26 namespace net { 24 namespace net {
27 25
28 namespace { 26 namespace {
29 27
30 const int kPollIntervalSec = 10; 28 const int kPollIntervalSec = 10;
31 29
32 void FreeIEConfig(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* ie_config) { 30 void FreeIEConfig(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* ie_config) {
33 if (ie_config->lpszAutoConfigUrl) 31 if (ie_config->lpszAutoConfigUrl)
34 GlobalFree(ie_config->lpszAutoConfigUrl); 32 GlobalFree(ie_config->lpszAutoConfigUrl);
35 if (ie_config->lpszProxy) 33 if (ie_config->lpszProxy)
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 std::string bypass_url_domain = proxy_server_bypass_list.token(); 161 std::string bypass_url_domain = proxy_server_bypass_list.token();
164 config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain); 162 config->proxy_rules().bypass_rules.AddRuleFromString(bypass_url_domain);
165 } 163 }
166 } 164 }
167 if (ie_config.lpszAutoConfigUrl) 165 if (ie_config.lpszAutoConfigUrl)
168 config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl)); 166 config->set_pac_url(GURL(ie_config.lpszAutoConfigUrl));
169 config->set_source(PROXY_CONFIG_SOURCE_SYSTEM); 167 config->set_source(PROXY_CONFIG_SOURCE_SYSTEM);
170 } 168 }
171 169
172 } // namespace net 170 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_win.cc ('k') | net/proxy/proxy_resolver_winhttp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698