Determine connection type in NetworkChangeNotifierLinux.

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.
 
 #include "net/base/network_change_notifier_linux.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
 #include "net/base/address_tracker_linux.h"
 #include "net/dns/dns_config_service.h"
 
 namespace net {
 
+namespace {
+NetworkChangeNotifierLinux* g_instance;
+}  // namespace
+
 class NetworkChangeNotifierLinux::Thread : public base::Thread {
  public:
   Thread();
   ~Thread() override;
 
   // Plumbing for NetworkChangeNotifier::GetCurrentConnectionType.
   // Safe to call from any thread.
   NetworkChangeNotifier::ConnectionType GetCurrentConnectionType() {
     return address_tracker_.GetCurrentConnectionType();
   }
 
   const internal::AddressTrackerLinux* address_tracker() const {
     return &address_tracker_;
   }
 
+  bool AddNetifToIgnore(const std::string& netif_name) {
+    return address_tracker_.AddNetifToIgnore(netif_name);
+  }
+  bool RemoveNetifToIgnore(const std::string& netif_name) {
+    return address_tracker_.RemoveNetifToIgnore(netif_name);
+  }
+
+  std::string GetPrimaryNetif() const {
+    return address_tracker_.GetPrimaryNetif();
+  };
+
  protected:
   // base::Thread
   void Init() override;
   void CleanUp() override;
 
  private:
   scoped_ptr<DnsConfigService> dns_config_service_;
   // Used to detect online/offline state and IP address changes.
   internal::AddressTrackerLinux address_tracker_;
 
@@ skipping 19 matching lines @@
   dns_config_service_ = DnsConfigService::CreateSystemService();
   dns_config_service_->WatchConfig(
       base::Bind(&NetworkChangeNotifier::SetDnsConfig));
 }
 
 void NetworkChangeNotifierLinux::Thread::CleanUp() {
   dns_config_service_.reset();
 }
 
 NetworkChangeNotifierLinux* NetworkChangeNotifierLinux::Create() {
-  return new NetworkChangeNotifierLinux();
+  g_instance = new NetworkChangeNotifierLinux();
+  return g_instance;
+}
+
+NetworkChangeNotifierLinux* NetworkChangeNotifierLinux::GetInstance() {
+  return g_instance;
 }
 
 NetworkChangeNotifierLinux::NetworkChangeNotifierLinux()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsLinux()),
       notifier_thread_(new Thread()) {
   // We create this notifier thread because the notification implementation
   // needs a MessageLoopForIO, and there's no guarantee that
   // MessageLoop::current() meets that criterion.
   base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
   notifier_thread_->StartWithOptions(thread_options);
@@ skipping 12 matching lines @@
   // Delay values arrived at by simple experimentation and adjusted so as to
   // produce a single signal when switching between network connections.
   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(2000);
   params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(2000);
   params.connection_type_offline_delay_ =
       base::TimeDelta::FromMilliseconds(1500);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
   return params;
 }
 
+scoped_refptr<base::MessageLoopProxy>
+NetworkChangeNotifierLinux::GetMessageLoopProxy() const {
+  return notifier_thread_->message_loop_proxy();
+}
+
 NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierLinux::GetCurrentConnectionType() const {
   return notifier_thread_->GetCurrentConnectionType();
 }
 
+bool NetworkChangeNotifierLinux::AddNetifToIgnore(
+    const std::string& netif_name) {
+  return notifier_thread_->AddNetifToIgnore(netif_name);
+}
+
+bool NetworkChangeNotifierLinux::RemoveNetifToIgnore(
+    const std::string& netif_name) {
+  return notifier_thread_->RemoveNetifToIgnore(netif_name);
+}
+
+std::string NetworkChangeNotifierLinux::GetPrimaryNetif() const {
+  return notifier_thread_->GetPrimaryNetif();
+}
+
 const internal::AddressTrackerLinux*
 NetworkChangeNotifierLinux::GetAddressTrackerInternal() const {
   return notifier_thread_->address_tracker();
 }
 
 }  // namespace net