net/proxy/proxy_server.cc - Issue 12087091: Move string tokenizer to base/strings.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« chrome/browser/chromeos/system/name_value_pairs_parser.cc ('K') | « net/proxy/proxy_resolver_v8.cc ('k') | net/websockets/websocket_handshake_handler.cc » ('j') | ui/base/gestures/gesture_sequence.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

	10 #include "base/strings/string_tokenizer.h"
	viettrungluu 2013/02/01 17:55:56 And this one? (Apparently, I hadn't looked at all And this one? (Apparently, I hadn't looked at all the files yet.)
11 #include "net/base/net_util.h"	11 #include "net/base/net_util.h"

12 #include "net/http/http_util.h"	12 #include "net/http/http_util.h"

13	13

14 namespace net {	14 namespace net {

15	15

16 namespace {	16 namespace {

17	17

18 // Parses the proxy type from a PAC string, to a ProxyServer::Scheme.	18 // Parses the proxy type from a PAC string, to a ProxyServer::Scheme.

19 // This mapping is case-insensitive. If no type could be matched	19 // This mapping is case-insensitive. If no type could be matched

20 // returns SCHEME_INVALID.	20 // returns SCHEME_INVALID.

(...skipping 214 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235 if (port == -1)	235 if (port == -1)

236 port = GetDefaultPortForScheme(scheme);	236 port = GetDefaultPortForScheme(scheme);

237	237

238 host_port_pair = HostPortPair(HostNoBrackets(host), port);	238 host_port_pair = HostPortPair(HostNoBrackets(host), port);

239 }	239 }

240	240

241 return ProxyServer(scheme, host_port_pair);	241 return ProxyServer(scheme, host_port_pair);

242 }	242 }

243	243

244 } // namespace net	244 } // namespace net

OLD	NEW