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

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

Issue 1162973005: Stop including ip_address_number.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove some header sorting changes, seems to be breaking windows Created 5 years, 6 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/network_interfaces_linux.cc ('k') | net/base/network_interfaces_unittest.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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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/network_interfaces_mac.h" 5 #include "net/base/network_interfaces_mac.h"
6 6
7 #include <ifaddrs.h> 7 #include <ifaddrs.h>
8 #include <net/if.h> 8 #include <net/if.h>
9 #include <netinet/in.h> 9 #include <netinet/in.h>
10 #include <set> 10 #include <set>
11 #include <sys/types.h> 11 #include <sys/types.h>
12 12
13 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_tokenizer.h" 17 #include "base/strings/string_tokenizer.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
20 #include "net/base/escape.h" 20 #include "net/base/escape.h"
21 #include "net/base/ip_endpoint.h" 21 #include "net/base/ip_endpoint.h"
22 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
23 #include "net/base/net_util.h"
23 #include "net/base/network_interfaces_posix.h" 24 #include "net/base/network_interfaces_posix.h"
24 #include "url/gurl.h" 25 #include "url/gurl.h"
25 26
26 #if !defined(OS_IOS) 27 #if !defined(OS_IOS)
27 #include <net/if_media.h> 28 #include <net/if_media.h>
28 #include <netinet/in_var.h> 29 #include <netinet/in_var.h>
29 #include <sys/ioctl.h> 30 #include <sys/ioctl.h>
30 #endif // !OS_IOS 31 #endif // !OS_IOS
31 32
32 namespace net { 33 namespace net {
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 freeifaddrs(interfaces); 243 freeifaddrs(interfaces);
243 return result; 244 return result;
244 } 245 }
245 246
246 std::string GetWifiSSID() { 247 std::string GetWifiSSID() {
247 NOTIMPLEMENTED(); 248 NOTIMPLEMENTED();
248 return ""; 249 return "";
249 } 250 }
250 251
251 } // namespace net 252 } // namespace net
OLDNEW
« no previous file with comments | « net/base/network_interfaces_linux.cc ('k') | net/base/network_interfaces_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698