Chrome OS: Use Manager.DefaultService for Default Network

chromeos/network/network_state_handler.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 103 matching lines @@
   // Returns true if any device of |type| is scanning.
   bool GetScanningByType(const NetworkTypePattern& type) const;
 
   // Finds and returns a network state by |service_path| or NULL if not found.
   // Note: NetworkState is frequently updated asynchronously, i.e. properties
   // are not always updated all at once. This will contain the most recent
   // value for each property. To receive notifications when a property changes,
   // observe this class and implement NetworkPropertyChanged().
   const NetworkState* GetNetworkState(const std::string& service_path) const;
 
-  // Returns the default connected network (which includes VPNs) or NULL.
-  // This is equivalent to ConnectedNetworkByType(kMatchTypeDefault).
+  // Returns the default network (which includes VPNs) based on the
+  // Shill Manager.DefaultNetwork property. Normally this is the same as
+  // ConnectedNetworkByType(kMatchTypeDefault), but the timing might differ.
   const NetworkState* DefaultNetwork() const;
 
   // Returns the FavoriteState associated to DefaultNetwork. Returns NULL if,
   // and only if, DefaultNetwork returns NULL.
   const FavoriteState* DefaultFavoriteNetwork() const;
 
   // Returns the primary connected network of matching |type|, otherwise NULL.
   const NetworkState* ConnectedNetworkByType(
       const NetworkTypePattern& type) const;
 
@@ skipping 138 matching lines @@
   // Called by ShillPropertyHandler when a technology list changes.
   virtual void TechnologyListChanged() OVERRIDE;
 
   // Called by |shill_property_handler_| when the service or device list has
   // changed and all entries have been updated. This updates the list and
   // notifies observers. If |type| == TYPE_NETWORK this also calls
   // CheckDefaultNetworkChanged().
   virtual void ManagedStateListChanged(
       ManagedState::ManagedType type) OVERRIDE;
 
+  // Called when the default network service changes. Sets default_network_path_
+  // and notifies listeners.
+  virtual void DefaultNetworkServiceChanged(
+      const std::string& service_path) OVERRIDE;
+
   // Called after construction. Called explicitly by tests after adding
   // test observers.
   void InitShillPropertyHandler();
 
  private:
   typedef std::list<base::Closure> ScanCallbackList;
   typedef std::map<std::string, ScanCallbackList> ScanCompleteCallbackMap;
   friend class NetworkStateHandlerTest;
   FRIEND_TEST_ALL_PREFIXES(NetworkStateHandlerTest, NetworkStateHandlerStub);
 
@@ skipping 13 matching lines @@
       const std::string& service_path) const;
   ManagedState* GetModifiableManagedState(const ManagedStateList* managed_list,
                                           const std::string& path) const;
 
   // Gets the list specified by |type|.
   ManagedStateList* GetManagedList(ManagedState::ManagedType type);
 
   // Helper function to notify observers. Calls CheckDefaultNetworkChanged().
   void OnNetworkConnectionStateChanged(NetworkState* network);
 
-  // If the default network changed returns true and sets
-  // |default_network_path_|.
-  bool CheckDefaultNetworkChanged();
-
-  // Logs an event and notifies observers.
-  void OnDefaultNetworkChanged();
+  // Notifies observers when the default network or its properties change.
+  void NotifyDefaultNetworkChanged(const NetworkState* default_network);
 
   // Notifies observers about changes to |network|.
-  void NetworkPropertiesUpdated(const NetworkState* network);
+  void NotifyNetworkPropertiesUpdated(const NetworkState* network);
 
   // Called whenever Device.Scanning state transitions to false.
   void ScanCompleted(const std::string& type);
 
   // Returns the technology type for |type|.
   std::string GetTechnologyForType(const NetworkTypePattern& type) const;
 
   // Shill property handler instance, owned by this class.
   scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
 
@@ skipping 19 matching lines @@
 
   // Callbacks to run when a scan for the technology type completes.
   ScanCompleteCallbackMap scan_complete_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_