API for connection type (Ethernet/WIFI/WWAN ...) in NetworkChangeNotifier.

net/base/network_change_notifier.cc

Index: net/base/network_change_notifier.cc
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index ec9cae06d79da8f6beac0145b10ff2635e5206e8..f5e8e1e1f798d7b649d0254a66a5021a6b61c08f 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -28,7 +28,9 @@ NetworkChangeNotifierFactory* g_network_change_notifier_factory = NULL;
 
 class MockNetworkChangeNotifier : public NetworkChangeNotifier {
  public:
-  virtual bool IsCurrentlyOffline() const { return false; }
+  virtual ConnectionType GetCurrentConnectionType() const {
+    return CONNECTION_ETHERNET;

[wtc, 2012/05/11 01:35:05]

Nit: CONNECTION_UNKNOWN seems better than CONNECTION_ETHERNET

+  }
 };
 
 }  // namespace
@@ -75,9 +77,11 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() {
 }
 
 // static
-bool NetworkChangeNotifier::IsOffline() {
-  return g_network_change_notifier &&
-         g_network_change_notifier->IsCurrentlyOffline();
+NetworkChangeNotifier::ConnectionType
+NetworkChangeNotifier::GetConnectionType() {
+  return (g_network_change_notifier) ?

[wtc, 2012/05/11 01:35:05]

Nit: no need to add parentheses around g_network_change_notifier.

+      g_network_change_notifier->GetCurrentConnectionType() :
+      CONNECTION_UNKNOWN;
 }
 
 // static
@@ -90,10 +94,10 @@ void NetworkChangeNotifier::AddIPAddressObserver(IPAddressObserver* observer) {
     g_network_change_notifier->ip_address_observer_list_->AddObserver(observer);
 }
 
-void NetworkChangeNotifier::AddOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::AddConnectionTypeObserver(
+    ConnectionTypeObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->AddObserver(
+    g_network_change_notifier->connection_type_observer_list_->AddObserver(
         observer);
   }
 }
@@ -113,10 +117,10 @@ void NetworkChangeNotifier::RemoveIPAddressObserver(
   }
 }
 
-void NetworkChangeNotifier::RemoveOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::RemoveConnectionTypeObserver(
+    ConnectionTypeObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->RemoveObserver(
+    g_network_change_notifier->connection_type_observer_list_->RemoveObserver(
         observer);
   }
 }
@@ -132,9 +136,9 @@ NetworkChangeNotifier::NetworkChangeNotifier()
     : ip_address_observer_list_(
         new ObserverListThreadSafe<IPAddressObserver>(
             ObserverListBase<IPAddressObserver>::NOTIFY_EXISTING_ONLY)),
-      online_state_observer_list_(
-        new ObserverListThreadSafe<OnlineStateObserver>(
-            ObserverListBase<OnlineStateObserver>::NOTIFY_EXISTING_ONLY)),
+      connection_type_observer_list_(
+        new ObserverListThreadSafe<ConnectionTypeObserver>(
+            ObserverListBase<ConnectionTypeObserver>::NOTIFY_EXISTING_ONLY)),
       resolver_state_observer_list_(
         new ObserverListThreadSafe<DNSObserver>(
             ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)) {
@@ -156,10 +160,11 @@ void NetworkChangeNotifier::NotifyObserversOfDNSChange(unsigned detail) {
   }
 }
 
-void NetworkChangeNotifier::NotifyObserversOfOnlineStateChange() {
+void NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange() {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->Notify(
-        &OnlineStateObserver::OnOnlineStateChanged, !IsOffline());
+    g_network_change_notifier->connection_type_observer_list_->Notify(
+        &ConnectionTypeObserver::OnConnectionTypeChanged,
+        GetConnectionType());
   }
 }