| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <set> | 7 #include <set> |
| 8 #include <sys/types.h> | 8 #include <sys/types.h> |
| 9 | 9 |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 return true; | 178 return true; |
| 179 } | 179 } |
| 180 #endif // OS_MACOSX | 180 #endif // OS_MACOSX |
| 181 } // namespace | 181 } // namespace |
| 182 | 182 |
| 183 namespace internal { | 183 namespace internal { |
| 184 | 184 |
| 185 #if !defined(OS_MACOSX) && !defined(OS_NACL) | 185 #if !defined(OS_MACOSX) && !defined(OS_NACL) |
| 186 | 186 |
| 187 inline const unsigned char* GetIPAddressData(const IPAddressNumber& ip) { | 187 inline const unsigned char* GetIPAddressData(const IPAddressNumber& ip) { |
| 188 #if defined(OS_ANDROID) | |
| 189 return ip.begin(); | |
| 190 #else | |
| 191 return ip.data(); | 188 return ip.data(); |
| 192 #endif | |
| 193 } | 189 } |
| 194 | 190 |
| 195 bool GetNetworkListImpl( | 191 bool GetNetworkListImpl( |
| 196 NetworkInterfaceList* networks, | 192 NetworkInterfaceList* networks, |
| 197 int policy, | 193 int policy, |
| 198 const base::hash_set<int>& online_links, | 194 const base::hash_set<int>& online_links, |
| 199 const internal::AddressTrackerLinux::AddressMap& address_map, | 195 const internal::AddressTrackerLinux::AddressMap& address_map, |
| 200 GetInterfaceNameFunction get_interface_name) { | 196 GetInterfaceNameFunction get_interface_name) { |
| 201 std::map<int, std::string> ifnames; | 197 std::map<int, std::string> ifnames; |
| 202 | 198 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 405 WifiPHYLayerProtocol GetWifiPHYLayerProtocol() { | 401 WifiPHYLayerProtocol GetWifiPHYLayerProtocol() { |
| 406 return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN; | 402 return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN; |
| 407 } | 403 } |
| 408 | 404 |
| 409 scoped_ptr<ScopedWifiOptions> SetWifiOptions(int options) { | 405 scoped_ptr<ScopedWifiOptions> SetWifiOptions(int options) { |
| 410 return scoped_ptr<ScopedWifiOptions>(); | 406 return scoped_ptr<ScopedWifiOptions>(); |
| 411 } | 407 } |
| 412 | 408 |
| 413 | 409 |
| 414 } // namespace net | 410 } // namespace net |
| OLD | NEW |