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

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

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes 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
« no previous file with comments | « net/base/net_log.cc ('k') | net/http/http_auth_handler.h » ('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/ucnv.h> 9 #include <unicode/ucnv.h>
10 #include <unicode/uidna.h> 10 #include <unicode/uidna.h>
(...skipping 15 matching lines...) Expand all
26 #include <netdb.h> 26 #include <netdb.h>
27 #include <net/if.h> 27 #include <net/if.h>
28 #include <netinet/in.h> 28 #include <netinet/in.h>
29 #include <sys/socket.h> 29 #include <sys/socket.h>
30 #endif 30 #endif
31 31
32 #include "base/base64.h" 32 #include "base/base64.h"
33 #include "base/basictypes.h" 33 #include "base/basictypes.h"
34 #include "base/file_path.h" 34 #include "base/file_path.h"
35 #include "base/file_util.h" 35 #include "base/file_util.h"
36 #include "base/histogram.h"
36 #include "base/i18n/file_util_icu.h" 37 #include "base/i18n/file_util_icu.h"
37 #include "base/i18n/icu_string_conversions.h" 38 #include "base/i18n/icu_string_conversions.h"
38 #include "base/i18n/time_formatting.h" 39 #include "base/i18n/time_formatting.h"
39 #include "base/json/string_escape.h" 40 #include "base/json/string_escape.h"
40 #include "base/lock.h" 41 #include "base/lock.h"
41 #include "base/logging.h" 42 #include "base/logging.h"
42 #include "base/message_loop.h" 43 #include "base/message_loop.h"
43 #include "base/path_service.h" 44 #include "base/path_service.h"
44 #include "base/singleton.h" 45 #include "base/singleton.h"
45 #include "base/stl_util-inl.h" 46 #include "base/stl_util-inl.h"
(...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 } 1916 }
1916 1917
1917 int GetPortFromAddrinfo(const struct addrinfo* info) { 1918 int GetPortFromAddrinfo(const struct addrinfo* info) {
1918 uint16* port_field = GetPortFieldFromAddrinfo(info); 1919 uint16* port_field = GetPortFieldFromAddrinfo(info);
1919 if (!port_field) 1920 if (!port_field)
1920 return -1; 1921 return -1;
1921 return ntohs(*port_field); 1922 return ntohs(*port_field);
1922 } 1923 }
1923 1924
1924 } // namespace net 1925 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_log.cc ('k') | net/http/http_auth_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698