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

net/base/network_change_notifier_linux.cc

 // Copyright (c) 2012 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.
 //
 // This implementation of NetworkChangeNotifier's offline state detection
 // depends on D-Bus and NetworkManager, and is known to work on at least
 // GNOME version 2.30.  If D-Bus or NetworkManager are unavailable, this
 // implementation will always behave as if it is online.
 
 #include "net/base/network_change_notifier_linux.h"
@@ skipping 89 matching lines @@
         system_bus_(bus) { }
 
   ~NetworkManagerApi() { }
 
   // Should be called on a helper thread which must be of type IO.
   void Init();
 
   // Must be called by the helper thread's CleanUp() method.
   void CleanUp();
 
-  // Implementation of NetworkChangeNotifierLinux::IsCurrentlyOffline().
+  // Implementation of NetworkChangeNotifierLinux::GetCurrentConnectionType().
   // Safe to call from any thread, but will block until Init() has completed.
-  bool IsCurrentlyOffline();
+  NetworkChangeNotifier::ConnectionType GetCurrentConnectionType();
 
  private:
   // Callbacks for D-Bus API.
   void OnInitialResponse(dbus::Response* response) {
     HandleResponse(response);
     offline_state_initialized_.Signal();
   }
 
   void OnSignaled(dbus::Signal* signal);
 
@@ skipping 126 matching lines @@
     case NM_LEGACY_STATE_ASLEEP:
     case NM_STATE_ASLEEP:
       // Networking disabled or no devices on system
       return true;
     default:
       // Unknown status
       return false;
   }
 }
 
-bool NetworkManagerApi::IsCurrentlyOffline() {
+NetworkChangeNotifier::ConnectionType
+NetworkManagerApi::GetCurrentConnectionType() {
   // http://crbug.com/125097
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   offline_state_initialized_.Wait();
   base::AutoLock lock(is_offline_lock_);
-  return is_offline_;
+  // TODO(droger): Return something more detailed than CONNECTION_UNKNOWN.
+  return is_offline_ ? NetworkChangeNotifier::CONNECTION_NONE :
+                       NetworkChangeNotifier::CONNECTION_UNKNOWN;
 }
 
 class NetworkChangeNotifierLinux::Thread
     : public base::Thread, public MessageLoopForIO::Watcher {
  public:
   explicit Thread(dbus::Bus* bus);
   virtual ~Thread();
 
   // MessageLoopForIO::Watcher:
   virtual void OnFileCanReadWithoutBlocking(int fd);
   virtual void OnFileCanWriteWithoutBlocking(int /* fd */);
 
-  // Plumbing for NetworkChangeNotifier::IsCurrentlyOffline.
+  // Plumbing for NetworkChangeNotifier::GetCurrentConnectionType.
   // Safe to call from any thread.
-  bool IsCurrentlyOffline() {
-    return network_manager_api_.IsCurrentlyOffline();
+  NetworkChangeNotifier::ConnectionType GetCurrentConnectionType() {
+    return network_manager_api_.GetCurrentConnectionType();
   }
 
  protected:
   // base::Thread
   virtual void Init();
   virtual void CleanUp();
 
  private:
   // Starts listening for netlink messages.  Also handles the messages if there
   // are any available on the netlink socket.
@@ skipping 10 matching lines @@
 
   // Technically only needed for ChromeOS, but it's ugly to #ifdef out.
   base::WeakPtrFactory<Thread> ptr_factory_;
 
   // Used to watch for changes to /etc/resolv.conf and /etc/hosts.
   scoped_ptr<base::files::FilePathWatcher> resolv_file_watcher_;
   scoped_ptr<base::files::FilePathWatcher> hosts_file_watcher_;
   scoped_refptr<DNSWatchDelegate> resolv_watcher_delegate_;
   scoped_refptr<DNSWatchDelegate> hosts_watcher_delegate_;
 
-  // Used to detect online/offline state changes.
+  // Used to detect connection type changes.
   NetworkManagerApi network_manager_api_;
 
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 NetworkChangeNotifierLinux::Thread::Thread(dbus::Bus* bus)
     : base::Thread("NetworkChangeNotifier"),
       netlink_fd_(kInvalidSocket),
       ALLOW_THIS_IN_INITIALIZER_LIST(ptr_factory_(this)),
       network_manager_api_(
           base::Bind(&NetworkChangeNotifier
-                     ::NotifyObserversOfOnlineStateChange),
+                     ::NotifyObserversOfConnectionTypeChange),

[wtc, 2012/05/11 18:46:22]

Nit: put :: on the previous line.  Our convention is to
put the operator at the end of the previous line when we
need to break a line.

           bus) {
 }
 
 NetworkChangeNotifierLinux::Thread::~Thread() {
   DCHECK(!Thread::IsRunning());
 }
 
 void NetworkChangeNotifierLinux::Thread::Init() {
   resolv_file_watcher_.reset(new FilePathWatcher);
   hosts_file_watcher_.reset(new FilePathWatcher);
@@ skipping 101 matching lines @@
   base::Thread::Options thread_options(MessageLoop::TYPE_IO, 0);
   notifier_thread_->StartWithOptions(thread_options);
 }
 
 NetworkChangeNotifierLinux::~NetworkChangeNotifierLinux() {
   // Stopping from here allows us to sanity- check that the notifier
   // thread shut down properly.
   notifier_thread_->Stop();
 }
 
-bool NetworkChangeNotifierLinux::IsCurrentlyOffline() const {
-  return notifier_thread_->IsCurrentlyOffline();
+NetworkChangeNotifier::ConnectionType
+NetworkChangeNotifierLinux::GetCurrentConnectionType() const {
+  return notifier_thread_->GetCurrentConnectionType();
 }
 
 }  // namespace net