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

net/base/network_change_notifier.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_change_notifier_factory.h"
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include "net/base/network_change_notifier_win.h"
 #elif defined(OS_LINUX) || defined(OS_ANDROID)
@@ skipping 10 matching lines @@
 // in ways that would require us to place locks around access to this object.
 // (The prohibition on global non-POD objects makes it tricky to do such a thing
 // anyway.)
 NetworkChangeNotifier* g_network_change_notifier = NULL;
 
 // Class factory singleton.
 NetworkChangeNotifierFactory* g_network_change_notifier_factory = NULL;
 
 class MockNetworkChangeNotifier : public NetworkChangeNotifier {
  public:
-  virtual bool IsCurrentlyOffline() const { return false; }
+  virtual ConnectionState GetCurrentConnectionState() const { return ETHERNET; }
 };
 
 }  // namespace
 
 NetworkChangeNotifier::~NetworkChangeNotifier() {
   DCHECK_EQ(this, g_network_change_notifier);
   g_network_change_notifier = NULL;
 }
 
 // static
@@ skipping 21 matching lines @@
   return NetworkChangeNotifierLinux::Create();
 #elif defined(OS_MACOSX)
   return new NetworkChangeNotifierMac();
 #else
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
 // static
-bool NetworkChangeNotifier::IsOffline() {
-  return g_network_change_notifier &&
-         g_network_change_notifier->IsCurrentlyOffline();
+NetworkChangeNotifier::ConnectionState
+NetworkChangeNotifier::GetConnectionState() {
+  return (g_network_change_notifier) ?
+      g_network_change_notifier->GetCurrentConnectionState() :
+      ETHERNET;

[joth, 2012/01/10 10:48:35]

UNKNOWN, I would have thought?

Also, this probably needs a comment or TODO about fetching more detailed info,
if possible.

[droger_google, 2012/01/10 11:48:26]

I used ETHERNET as a default value, but we could totally use UNKNOWN instead.

 }
 
 // static
 NetworkChangeNotifier* NetworkChangeNotifier::CreateMock() {
   return new MockNetworkChangeNotifier();
 }
 
 void NetworkChangeNotifier::AddIPAddressObserver(IPAddressObserver* observer) {
   if (g_network_change_notifier)
     g_network_change_notifier->ip_address_observer_list_->AddObserver(observer);
 }
 
-void NetworkChangeNotifier::AddOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::AddConnectionStateObserver(
+    ConnectionStateObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->AddObserver(
+    g_network_change_notifier->connection_state_observer_list_->AddObserver(
         observer);
   }
 }
 
 void NetworkChangeNotifier::AddDNSObserver(DNSObserver* observer) {
   if (g_network_change_notifier) {
     g_network_change_notifier->resolver_state_observer_list_->AddObserver(
         observer);
   }
 }
 
 void NetworkChangeNotifier::RemoveIPAddressObserver(
     IPAddressObserver* observer) {
   if (g_network_change_notifier) {
     g_network_change_notifier->ip_address_observer_list_->RemoveObserver(
         observer);
   }
 }
 
-void NetworkChangeNotifier::RemoveOnlineStateObserver(
-    OnlineStateObserver* observer) {
+void NetworkChangeNotifier::RemoveConnectionStateObserver(
+    ConnectionStateObserver* observer) {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->RemoveObserver(
+    g_network_change_notifier->connection_state_observer_list_->RemoveObserver(
         observer);
   }
 }
 
 void NetworkChangeNotifier::RemoveDNSObserver(DNSObserver* observer) {
   if (g_network_change_notifier) {
     g_network_change_notifier->resolver_state_observer_list_->RemoveObserver(
         observer);
   }
 }
 
 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_state_observer_list_(
+        new ObserverListThreadSafe<ConnectionStateObserver>(
+            ObserverListBase<ConnectionStateObserver>::NOTIFY_EXISTING_ONLY)),
       resolver_state_observer_list_(
         new ObserverListThreadSafe<DNSObserver>(
             ObserverListBase<DNSObserver>::NOTIFY_EXISTING_ONLY)) {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = this;
 }
 
 void NetworkChangeNotifier::NotifyObserversOfIPAddressChange() {
   if (g_network_change_notifier) {
     g_network_change_notifier->ip_address_observer_list_->Notify(
         &IPAddressObserver::OnIPAddressChanged);
   }
 }
 
 void NetworkChangeNotifier::NotifyObserversOfDNSChange() {
   if (g_network_change_notifier) {
     g_network_change_notifier->resolver_state_observer_list_->Notify(
         &DNSObserver::OnDNSChanged);
   }
 }
 
-void NetworkChangeNotifier::NotifyObserversOfOnlineStateChange() {
+void NetworkChangeNotifier::NotifyObserversOfConnectionStateChange() {
   if (g_network_change_notifier) {
-    g_network_change_notifier->online_state_observer_list_->Notify(
-        &OnlineStateObserver::OnOnlineStateChanged, !IsOffline());
+    g_network_change_notifier->connection_state_observer_list_->Notify(
+        &ConnectionStateObserver::OnConnectionStateChanged,
+        GetConnectionState());
   }
 }
 
 NetworkChangeNotifier::DisableForTest::DisableForTest()
     : network_change_notifier_(g_network_change_notifier) {
   DCHECK(g_network_change_notifier);
   g_network_change_notifier = NULL;
 }
 
 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = network_change_notifier_;
 }
 
 }  // namespace net