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

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

Issue 17635: Remove HttpTransactionWinHttp and the --winhttp command-line... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 | « net/net_unittests.scons ('k') | webkit/tools/layout_tests/run_webkit_tests.py » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_service.h" 5 #include "net/proxy/proxy_service.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <winhttp.h> 9 #include <winhttp.h>
10 #endif 10 #endif
11 11
12 #include <algorithm> 12 #include <algorithm>
13 13
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/string_tokenizer.h" 16 #include "base/string_tokenizer.h"
17 #include "base/string_util.h" 17 #include "base/string_util.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
20 #include "net/proxy/proxy_config_service_fixed.h" 20 #include "net/proxy/proxy_config_service_fixed.h"
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "net/http/http_transaction_winhttp.h"
23 #include "net/proxy/proxy_config_service_win.h" 22 #include "net/proxy/proxy_config_service_win.h"
24 #include "net/proxy/proxy_resolver_winhttp.h" 23 #include "net/proxy/proxy_resolver_winhttp.h"
25 #elif defined(OS_MACOSX) 24 #elif defined(OS_MACOSX)
26 #include "net/proxy/proxy_resolver_mac.h" 25 #include "net/proxy/proxy_resolver_mac.h"
27 #endif 26 #endif
28 27
29 using base::TimeDelta; 28 using base::TimeDelta;
30 using base::TimeTicks; 29 using base::TimeTicks;
31 30
32 namespace net { 31 namespace net {
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 // http://www.tcd.ie/iss/internet/osx_proxy.php for a real-world example). 557 // http://www.tcd.ie/iss/internet/osx_proxy.php for a real-world example).
559 // That's kinda cool so we'll provide that for everyone. 558 // That's kinda cool so we'll provide that for everyone.
560 // TODO(avi): implement here 559 // TODO(avi): implement here
561 } 560 }
562 561
563 return false; 562 return false;
564 } 563 }
565 564
566 } // namespace net 565 } // namespace net
567 566
OLDNEW
« no previous file with comments | « net/net_unittests.scons ('k') | webkit/tools/layout_tests/run_webkit_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698