Add DefaultNetworkChanged signal for ConnectivityStateHelper observers

chrome/browser/chromeos/net/connectivity_state_helper.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/net/connectivity_state_helper.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 21 matching lines @@
   virtual bool IsConnecting() OVERRIDE;
   virtual bool IsConnectedType(const std::string& type) OVERRIDE;
   virtual bool IsConnectingType(const std::string& type) OVERRIDE;
   virtual std::string NetworkNameForType(const std::string& type) OVERRIDE;
   virtual std::string DefaultNetworkName() OVERRIDE;
   virtual bool DefaultNetworkOnline() OVERRIDE;
   virtual void RequestScan() const OVERRIDE;
 
   // NetworkStateHandlerObserver overrides.
   virtual void NetworkManagerChanged() OVERRIDE;
+  virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
 
  private:
   NetworkStateHandler* network_state_handler_;
 };
 
 // Implementation of the connectivity state helper that uses the network
 // library for fetching connectivity state.
 class ConnectivityStateHelperNetworkLibrary
     : public ConnectivityStateHelper,
       public NetworkLibrary::NetworkManagerObserver {
@@ skipping 58 matching lines @@
 }
 
 // static
 void ConnectivityStateHelper::SetForTest(ConnectivityStateHelper* impl) {
   CHECK(!g_test_connectivity_state_helper || !impl);
   g_test_connectivity_state_helper = impl;
 }
 
 void ConnectivityStateHelper::AddNetworkManagerObserver(
     ConnectivityStateHelperObserver* observer) {
-  network_manager_observers_.AddObserver(observer);
+  connectivity_observers_.AddObserver(observer);
 }
 
 void ConnectivityStateHelper::RemoveNetworkManagerObserver(
     ConnectivityStateHelperObserver* observer) {
-  network_manager_observers_.RemoveObserver(observer);
+  connectivity_observers_.RemoveObserver(observer);
 }
 
 ConnectivityStateHelperImpl::ConnectivityStateHelperImpl() {
   network_state_handler_ = NetworkStateHandler::Get();
   network_state_handler_->AddObserver(this);
 }
 
 ConnectivityStateHelperImpl::~ConnectivityStateHelperImpl() {
   NetworkStateHandler::Get()->RemoveObserver(this);
 }
@@ skipping 42 matching lines @@
   if (network->connection_state() == flimflam::kStatePortal)
     return false;
   return true;
 }
 
 void ConnectivityStateHelperImpl::RequestScan() const {
   network_state_handler_->RequestScan();
 }
 
 void ConnectivityStateHelperImpl::NetworkManagerChanged() {
-  FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, network_manager_observers_,
+  FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, connectivity_observers_,
                     NetworkManagerChanged());
 }
 
+void ConnectivityStateHelperImpl::DefaultNetworkChanged(
+    const NetworkState* network) {
+  FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, connectivity_observers_,
+                    DefaultNetworkChanged());
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkLibrary implementation.
 //
 
 ConnectivityStateHelperNetworkLibrary::ConnectivityStateHelperNetworkLibrary() {
   network_library_ = CrosLibrary::Get()->GetNetworkLibrary();
   network_library_->AddNetworkManagerObserver(this);
 }
 
 ConnectivityStateHelperNetworkLibrary::~ConnectivityStateHelperNetworkLibrary()
@@ skipping 64 matching lines @@
     return false;
   return true;
 }
 
 void ConnectivityStateHelperNetworkLibrary::RequestScan() const {
   network_library_->RequestNetworkScan();
 }
 
 void ConnectivityStateHelperNetworkLibrary::OnNetworkManagerChanged(
     NetworkLibrary* network_library) {
-  FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, network_manager_observers_,
+  FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, connectivity_observers_,
                     NetworkManagerChanged());
 }
 
 }  // namespace chromeos