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

Side by Side Diff: net/base/network_interfaces_linux.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/net_util.cc ('k') | net/base/network_interfaces_mac.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_linux.h" 5 #include "net/base/network_interfaces_linux.h"
6 6
7 #if !defined(OS_ANDROID) 7 #if !defined(OS_ANDROID)
8 #include <linux/ethtool.h> 8 #include <linux/ethtool.h>
9 #endif // !defined(OS_ANDROID) 9 #endif // !defined(OS_ANDROID)
10 #include <linux/if.h> 10 #include <linux/if.h>
11 #include <linux/sockios.h> 11 #include <linux/sockios.h>
12 #include <linux/wireless.h> 12 #include <linux/wireless.h>
13 #include <set> 13 #include <set>
14 #include <sys/ioctl.h> 14 #include <sys/ioctl.h>
15 #include <sys/types.h> 15 #include <sys/types.h>
16 16
17 #include "base/files/file_path.h" 17 #include "base/files/file_path.h"
18 #include "base/files/scoped_file.h" 18 #include "base/files/scoped_file.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
21 #include "base/strings/string_number_conversions.h" 21 #include "base/strings/string_number_conversions.h"
22 #include "base/strings/string_tokenizer.h" 22 #include "base/strings/string_tokenizer.h"
23 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
24 #include "base/threading/thread_restrictions.h" 24 #include "base/threading/thread_restrictions.h"
25 #include "net/base/address_tracker_linux.h" 25 #include "net/base/address_tracker_linux.h"
26 #include "net/base/escape.h" 26 #include "net/base/escape.h"
27 #include "net/base/ip_endpoint.h" 27 #include "net/base/ip_endpoint.h"
28 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
29 #include "net/base/net_util.h"
29 #include "net/base/network_interfaces_posix.h" 30 #include "net/base/network_interfaces_posix.h"
30 #include "url/gurl.h" 31 #include "url/gurl.h"
31 32
32 namespace net { 33 namespace net {
33 34
34 namespace { 35 namespace {
35 36
36 // When returning true, the platform native IPv6 address attributes were 37 // When returning true, the platform native IPv6 address attributes were
37 // successfully converted to net IP address attributes. Otherwise, returning 38 // successfully converted to net IP address attributes. Otherwise, returning
38 // false and the caller should drop the IP address which can't be used by the 39 // false and the caller should drop the IP address which can't be used by the
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 std::string GetWifiSSID() { 218 std::string GetWifiSSID() {
218 NetworkInterfaceList networks; 219 NetworkInterfaceList networks;
219 if (GetNetworkList(&networks, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) { 220 if (GetNetworkList(&networks, INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) {
220 return internal::GetWifiSSIDFromInterfaceListInternal( 221 return internal::GetWifiSSIDFromInterfaceListInternal(
221 networks, internal::GetInterfaceSSID); 222 networks, internal::GetInterfaceSSID);
222 } 223 }
223 return ""; 224 return "";
224 } 225 }
225 226
226 } // namespace net 227 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_util.cc ('k') | net/base/network_interfaces_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698