| OLD | NEW |
| 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 #include "net/base/network_change_notifier_win.h" | 5 #include "net/base/network_change_notifier_win.h" |
| 6 | 6 |
| 7 #include <iphlpapi.h> | 7 #include <iphlpapi.h> |
| 8 #include <winsock2.h> | 8 #include <winsock2.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 } else { | 193 } else { |
| 194 LOG(WARNING) << "WSALookupServiceNext() failed with:" << result; | 194 LOG(WARNING) << "WSALookupServiceNext() failed with:" << result; |
| 195 } | 195 } |
| 196 } | 196 } |
| 197 | 197 |
| 198 result = WSALookupServiceEnd(ws_handle); | 198 result = WSALookupServiceEnd(ws_handle); |
| 199 LOG_IF(ERROR, result != 0) | 199 LOG_IF(ERROR, result != 0) |
| 200 << "WSALookupServiceEnd() failed with: " << result; | 200 << "WSALookupServiceEnd() failed with: " << result; |
| 201 | 201 |
| 202 // TODO(droger): Return something more detailed than CONNECTION_UNKNOWN. | 202 // TODO(droger): Return something more detailed than CONNECTION_UNKNOWN. |
| 203 return found_connection ? NetworkChangeNotifier::CONNECTION_UNKNOWN : | 203 return found_connection ? ConnectionTypeFromInterfaces() |
| 204 NetworkChangeNotifier::CONNECTION_NONE; | 204 : NetworkChangeNotifier::CONNECTION_NONE; |
| 205 } | 205 } |
| 206 | 206 |
| 207 NetworkChangeNotifier::ConnectionType | 207 NetworkChangeNotifier::ConnectionType |
| 208 NetworkChangeNotifierWin::GetCurrentConnectionType() const { | 208 NetworkChangeNotifierWin::GetCurrentConnectionType() const { |
| 209 base::AutoLock auto_lock(last_computed_connection_type_lock_); | 209 base::AutoLock auto_lock(last_computed_connection_type_lock_); |
| 210 return last_computed_connection_type_; | 210 return last_computed_connection_type_; |
| 211 } | 211 } |
| 212 | 212 |
| 213 void NetworkChangeNotifierWin::SetCurrentConnectionType( | 213 void NetworkChangeNotifierWin::SetCurrentConnectionType( |
| 214 ConnectionType connection_type) { | 214 ConnectionType connection_type) { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 | 322 |
| 323 NotifyObserversOfConnectionTypeChange(); | 323 NotifyObserversOfConnectionTypeChange(); |
| 324 double max_bandwidth_mbps = 0.0; | 324 double max_bandwidth_mbps = 0.0; |
| 325 ConnectionType connection_type = CONNECTION_NONE; | 325 ConnectionType connection_type = CONNECTION_NONE; |
| 326 GetCurrentMaxBandwidthAndConnectionType(&max_bandwidth_mbps, | 326 GetCurrentMaxBandwidthAndConnectionType(&max_bandwidth_mbps, |
| 327 &connection_type); | 327 &connection_type); |
| 328 NotifyObserversOfMaxBandwidthChange(max_bandwidth_mbps, connection_type); | 328 NotifyObserversOfMaxBandwidthChange(max_bandwidth_mbps, connection_type); |
| 329 } | 329 } |
| 330 | 330 |
| 331 } // namespace net | 331 } // namespace net |
| OLD | NEW |