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

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

Issue 1290723003: Stop including network_interfaces.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TOT and remove AUTHORS change as it is there already Created 5 years, 4 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 | « media/cast/net/cast_transport_sender_impl.cc ('k') | net/base/network_change_notifier.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef NET_BASE_NET_UTIL_H_ 5 #ifndef NET_BASE_NET_UTIL_H_
6 #define NET_BASE_NET_UTIL_H_ 6 #define NET_BASE_NET_UTIL_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include <windows.h> 11 #include <windows.h>
12 #include <ws2tcpip.h> 12 #include <ws2tcpip.h>
13 #elif defined(OS_POSIX) 13 #elif defined(OS_POSIX)
14 #include <sys/types.h> 14 #include <sys/types.h>
15 #include <sys/socket.h> 15 #include <sys/socket.h>
16 #endif 16 #endif
17 17
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "base/basictypes.h" 21 #include "base/basictypes.h"
22 #include "base/strings/string16.h" 22 #include "base/strings/string16.h"
23 #include "base/strings/utf_offset_string_conversions.h" 23 #include "base/strings/utf_offset_string_conversions.h"
24 #include "net/base/address_family.h" 24 #include "net/base/address_family.h"
25 #include "net/base/escape.h" 25 #include "net/base/escape.h"
26 #include "net/base/net_export.h" 26 #include "net/base/net_export.h"
27 #include "net/base/network_change_notifier.h" 27 #include "net/base/network_change_notifier.h"
28 // TODO(eroman): Remove this header and require consumers to include it
29 // directly.
30 #include "net/base/network_interfaces.h"
31 28
32 class GURL; 29 class GURL;
33 30
34 namespace base { 31 namespace base {
35 class Time; 32 class Time;
36 } 33 }
37 34
38 namespace url { 35 namespace url {
39 struct CanonHostInfo; 36 struct CanonHostInfo;
40 struct Parsed; 37 struct Parsed;
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 DSCP_CS5 = 40, // Video 264 DSCP_CS5 = 40, // Video
268 DSCP_EF = 46, // Voice 265 DSCP_EF = 46, // Voice
269 DSCP_CS6 = 48, // Voice 266 DSCP_CS6 = 48, // Voice
270 DSCP_CS7 = 56, // Control messages 267 DSCP_CS7 = 56, // Control messages
271 DSCP_LAST = DSCP_CS7 268 DSCP_LAST = DSCP_CS7
272 }; 269 };
273 270
274 } // namespace net 271 } // namespace net
275 272
276 #endif // NET_BASE_NET_UTIL_H_ 273 #endif // NET_BASE_NET_UTIL_H_
OLDNEW
« no previous file with comments | « media/cast/net/cast_transport_sender_impl.cc ('k') | net/base/network_change_notifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698