[CrOS Tether] Update NetworkState to include tether properties and integrate into NetworkStateHandl…

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 <memory>
 #include <set>
@@ skipping 190 matching lines @@
   // found. This returns all entries (IsInProfile() may be true or false).
   const NetworkState* GetNetworkStateFromGuid(const std::string& guid) const;
 
   // Creates a Tether NetworkState that has no underlying shill type or
   // service. When initially created, it does not actually represent a real
   // network. The |guid| provided must be non-empty. If a network with |guid|
   // already exists, this method will do nothing. Use the provided |guid| to
   // refer to and fetch this NetworkState in the future.
   // NOTE: only GetNetworkStateFromGuid is supported to fetch "tether"
   // NetworkStates.
-  void AddTetherNetworkState(const std::string& guid, const std::string& name);
+  void AddTetherNetworkState(const std::string& guid,
+                             const std::string& name,
+                             const std::string& carrier,
+                             int battery_percentage,
+                             int signal_strength);
+
+  // Updates the tether properties (carrier, battery percentage, and signal
+  // strength) for a network which has already been added via
+  // AddTetherNetworkState. Returns whether the update was successful.
+  bool UpdateTetherNetworkProperties(const std::string& guid,
+                                     const std::string& carrier,
+                                     int battery_percentage,
+                                     int signal_strength);
 
   // Remove a Tether NetworkState, using the same |guid| passed to
   // AddTetherNetworkState.
   void RemoveTetherNetworkState(const std::string& guid);
 
   // Inform NetworkStateHandler that the provided Tether network with the
-  // provided guid |tether_guid| is associated with the Wi-Fi network with the
-  // provided guid |wifi_ssid|. This Wi-Fi network can now be hidden in the UI,
-  // and the Tether network will act as its proxy. Returns false if the
-  // association failed (e.g. one or both networks don't exist).
+  // provided guid |tether_network_guid| is associated with the Wi-Fi network
+  // with the provided guid |wifi_network_guid|. This Wi-Fi network can now be
+  // hidden in the UI, and the Tether network will act as its proxy. Returns
+  // false if the association failed (i.e., one or both networks don't exist).

[Ryan Hansberry, 2017/04/18 16:08:55]

super nit: because this only describes one possible error case, "e.g." is
correct.

[Kyle Horimoto, 2017/04/18 17:15:23]

Done.

   bool AssociateTetherNetworkStateWithWifiNetwork(
       const std::string& tether_network_guid,
-      const std::string& wifi_network_ssid);
+      const std::string& wifi_network_guid);
 
   // Set the connection_state of the Tether NetworkState corresponding to the
   // provided |guid| to "Disconnected". This will be reflected in the UI.
   void SetTetherNetworkStateDisconnected(const std::string& guid);
 
   // Set the connection_state of the Tether NetworkState corresponding to the
   // provided |guid| to "Connecting". This will be reflected in the UI.
   void SetTetherNetworkStateConnecting(const std::string& guid);
 
   // Set the connection_state of the Tether NetworkState corresponding to the
@@ skipping 192 matching lines @@
   void NotifyScanCompleted(const DeviceState* device);
 
   // Returns one technology type for |type|. This technology will be the
   // highest priority technology in the type pattern.
   std::string GetTechnologyForType(const NetworkTypePattern& type) const;
 
   // Returns all the technology types for |type|.
   std::vector<std::string> GetTechnologiesForType(
       const NetworkTypePattern& type) const;
 
+  // Set the connection_state of a Tether NetworkState corresponding to the

[Ryan Hansberry, 2017/04/18 16:08:55]

Why did you move this?

[Kyle Horimoto, 2017/04/18 17:15:23]

All function declarations should be before all private instance field
declarations.

+  // provided |guid|.
+  void SetTetherNetworkStateConnectionState(
+      const std::string& guid,
+      const std::string& connection_state);
+
   // Shill property handler instance, owned by this class.
   std::unique_ptr<internal::ShillPropertyHandler> shill_property_handler_;
 
   // Observer list
   base::ObserverList<NetworkStateHandlerObserver, true> observers_;
 
   // List of managed network states
   ManagedStateList network_list_;
 
   // List of managed Tether network states, which exist separately from
@@ skipping 13 matching lines @@
   // List of interfaces on which portal check is enabled.
   std::string check_portal_list_;
 
   // Map of network specifiers to guids. Contains an entry for each
   // NetworkState that is not saved in a profile.
   SpecifierGuidMap specifier_guid_map_;
 
   // Ensure that Shutdown() gets called exactly once.
   bool did_shutdown_ = false;
 
-  // Set the |connection_state| of a Tether NetworkState corresponding to the
-  // provided |guid|.
-  void SetTetherNetworkStateConnectionState(
-      const std::string& guid,
-      const std::string& connection_state);
-
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_