Create a Tether section in the system tray network list.

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 73 matching lines @@
   // themselves and disable any networking.
   void Shutdown();
 
   // Add/remove observers.
   void AddObserver(NetworkStateHandlerObserver* observer,
                    const tracked_objects::Location& from_here);
   void RemoveObserver(NetworkStateHandlerObserver* observer,
                       const tracked_objects::Location& from_here);
 
   // Returns the state for technology |type|. Only
-  // NetworkTypePattern::Primitive, ::Mobile and ::Ethernet are supported.
+  // NetworkTypePattern::Primitive, ::Mobile, ::Ethernet, and ::Tether are
+  // supported.
   TechnologyState GetTechnologyState(const NetworkTypePattern& type) const;
   bool IsTechnologyAvailable(const NetworkTypePattern& type) const {
     return GetTechnologyState(type) != TECHNOLOGY_UNAVAILABLE;
   }
   bool IsTechnologyEnabled(const NetworkTypePattern& type) const {
     return GetTechnologyState(type) == TECHNOLOGY_ENABLED;
   }
   bool IsTechnologyProhibited(const NetworkTypePattern& type) const {
     return GetTechnologyState(type) == TECHNOLOGY_PROHIBITED;
   }
@@ skipping 69 matching lines @@
   // be stored or used beyond the scope of the calling function (i.e. they may
   // later become invalid, but only on the UI thread). SortNetworkList() will be
   // called if necessary to provide the states in a convenient order (see
   // SortNetworkList for details).
   void GetNetworkListByType(const NetworkTypePattern& type,
                             bool configured_only,
                             bool visible_only,
                             int limit,
                             NetworkStateList* list);
 
+  // Sets |list| to contain the list of "tether" networks. If |limit| > 0, that
+  // will determine the number of results; pass 0 for no limit. The returned
+  // list contains a copy of NetworkState pointers which should not be stored or
+  // used beyond the scope of the calling function (i.e. they may later become
+  // invalid, but only on the UI thread).
+  // NOTE: See AddTetherNetworkState for more information about "tether"
+  // networks.
+  void GetTetherNetworkList(int limit, NetworkStateList* list);
+
   // Finds and returns the NetworkState associated with |service_path| or NULL
   // if not found. If |configured_only| is true, only returns saved entries
   // (IsInProfile is true).
   const NetworkState* GetNetworkStateFromServicePath(
       const std::string& service_path,
       bool configured_only) const;
 
   // Finds and returns the NetworkState associated with |guid| or NULL if not
   // 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. Generates and returns a guid to be used to refer to and fetch this
-  // NetworkState in the future.
+  // 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.
-  const std::string CreateTetherNetworkState(const std::string& name);
+  void AddTetherNetworkState(const std::string& guid, const std::string& name);
 
-  // Remove a "tether" NetworkState, using the same guid that was returned by
-  // CreateTetherNetworkState.
+  // Remove a "tether" NetworkState, using the same |guid| passed to
+  // AddTetherNetworkState.
   void RemoveTetherNetworkState(const std::string& guid);
 
   // Sets |list| to contain the list of devices.  The returned list contains
   // a copy of DeviceState pointers which should not be stored or used beyond
   // the scope of the calling function (i.e. they may later become invalid, but
   // only on the UI thread).
   void GetDeviceList(DeviceStateList* list) const;
 
   // Like GetDeviceList() but only returns networks with matching |type|.
   void GetDeviceListByType(const NetworkTypePattern& type,
@@ skipping 218 matching lines @@
 
   // Ensure that Shutdown() gets called exactly once.
   bool did_shutdown_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_