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

Side by Side Diff: net/base/net_util.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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/base/host_mapping_rules.cc ('k') | net/ftp/ftp_directory_listing_parser_ls.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/base/net_util.h" 5 #include "net/base/net_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <unicode/regex.h> 9 #include <unicode/regex.h>
10 #include <unicode/ucnv.h> 10 #include <unicode/ucnv.h>
(...skipping 29 matching lines...) Expand all
40 #include "base/i18n/time_formatting.h" 40 #include "base/i18n/time_formatting.h"
41 #include "base/json/string_escape.h" 41 #include "base/json/string_escape.h"
42 #include "base/lock.h" 42 #include "base/lock.h"
43 #include "base/logging.h" 43 #include "base/logging.h"
44 #include "base/message_loop.h" 44 #include "base/message_loop.h"
45 #include "base/path_service.h" 45 #include "base/path_service.h"
46 #include "base/singleton.h" 46 #include "base/singleton.h"
47 #include "base/stl_util-inl.h" 47 #include "base/stl_util-inl.h"
48 #include "base/string_number_conversions.h" 48 #include "base/string_number_conversions.h"
49 #include "base/string_piece.h" 49 #include "base/string_piece.h"
50 #include "base/string_split.h"
50 #include "base/string_tokenizer.h" 51 #include "base/string_tokenizer.h"
51 #include "base/string_util.h" 52 #include "base/string_util.h"
52 #include "base/sys_string_conversions.h" 53 #include "base/sys_string_conversions.h"
53 #include "base/time.h" 54 #include "base/time.h"
54 #include "base/utf_offset_string_conversions.h" 55 #include "base/utf_offset_string_conversions.h"
55 #include "base/utf_string_conversions.h" 56 #include "base/utf_string_conversions.h"
56 #include "grit/net_resources.h" 57 #include "grit/net_resources.h"
57 #include "googleurl/src/gurl.h" 58 #include "googleurl/src/gurl.h"
58 #include "googleurl/src/url_canon.h" 59 #include "googleurl/src/url_canon.h"
59 #include "googleurl/src/url_canon_ip.h" 60 #include "googleurl/src/url_canon_ip.h"
(...skipping 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after
1986 } 1987 }
1987 1988
1988 int GetPortFromAddrinfo(const struct addrinfo* info) { 1989 int GetPortFromAddrinfo(const struct addrinfo* info) {
1989 uint16* port_field = GetPortFieldFromAddrinfo(info); 1990 uint16* port_field = GetPortFieldFromAddrinfo(info);
1990 if (!port_field) 1991 if (!port_field)
1991 return -1; 1992 return -1;
1992 return ntohs(*port_field); 1993 return ntohs(*port_field);
1993 } 1994 }
1994 1995
1995 } // namespace net 1996 } // namespace net
OLDNEW
« no previous file with comments | « net/base/host_mapping_rules.cc ('k') | net/ftp/ftp_directory_listing_parser_ls.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698