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

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

Issue 2969006: Revert 52336 - More header cleanup:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 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/http/http_auth_handler.h ('k') | net/server/http_listen_socket.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/histogram.h"
12 #include "base/message_loop.h" 11 #include "base/message_loop.h"
13 #include "base/string_util.h" 12 #include "base/string_util.h"
14 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
15 #include "net/base/forwarding_net_log.h" 14 #include "net/base/forwarding_net_log.h"
16 #include "net/base/net_log.h" 15 #include "net/base/net_log.h"
17 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
18 #include "net/base/net_util.h" 17 #include "net/base/net_util.h"
19 #include "net/proxy/init_proxy_resolver.h" 18 #include "net/proxy/init_proxy_resolver.h"
20 #include "net/proxy/multi_threaded_proxy_resolver.h" 19 #include "net/proxy/multi_threaded_proxy_resolver.h"
21 #include "net/proxy/proxy_config_service_fixed.h" 20 #include "net/proxy/proxy_config_service_fixed.h"
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 OnCompletion(result_); 772 OnCompletion(result_);
774 } 773 }
775 } 774 }
776 775
777 void SyncProxyServiceHelper::OnCompletion(int rv) { 776 void SyncProxyServiceHelper::OnCompletion(int rv) {
778 result_ = rv; 777 result_ = rv;
779 event_.Signal(); 778 event_.Signal();
780 } 779 }
781 780
782 } // namespace net 781 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_auth_handler.h ('k') | net/server/http_listen_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698