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

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

Issue 12087091: Move string tokenizer to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 7 years, 10 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/proxy/proxy_resolver_v8.cc ('k') | net/websockets/websocket_handshake_handler.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_server.h" 5 #include "net/proxy/proxy_server.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/string_tokenizer.h"
10 #include "base/string_util.h" 9 #include "base/string_util.h"
11 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
12 #include "net/http/http_util.h" 11 #include "net/http/http_util.h"
13 12
14 namespace net { 13 namespace net {
15 14
16 namespace { 15 namespace {
17 16
18 // Parses the proxy type from a PAC string, to a ProxyServer::Scheme. 17 // Parses the proxy type from a PAC string, to a ProxyServer::Scheme.
19 // This mapping is case-insensitive. If no type could be matched 18 // This mapping is case-insensitive. If no type could be matched
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 if (port == -1) 234 if (port == -1)
236 port = GetDefaultPortForScheme(scheme); 235 port = GetDefaultPortForScheme(scheme);
237 236
238 host_port_pair = HostPortPair(HostNoBrackets(host), port); 237 host_port_pair = HostPortPair(HostNoBrackets(host), port);
239 } 238 }
240 239
241 return ProxyServer(scheme, host_port_pair); 240 return ProxyServer(scheme, host_port_pair);
242 } 241 }
243 242
244 } // namespace net 243 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_resolver_v8.cc ('k') | net/websockets/websocket_handshake_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698