Create a Tether section in the system tray network list.

chromeos/network/network_state_handler.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 "chromeos/network/network_state_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
@@ skipping 182 matching lines @@
       continue;
     if (device->Matches(type) && device->scanning())
       return true;
   }
   return false;
 }
 
 const NetworkState* NetworkStateHandler::GetNetworkState(
     const std::string& service_path) const {
   const NetworkState* network = GetModifiableNetworkState(service_path);
+  // This is a hack that I don't intend to keep here.

[Ryan Hansberry, 2017/02/15 19:57:39]

Could/should NetworkListMd be changed to use NetworkState's guids instead of
their paths?

[stevenjb, 2017/02/15 20:59:04]

We shouldn't do this hack. Ideally converting NetworkListMd to use guid for
everything would be great, but for TETHER networks it will need to call
GetNetworkStateFromGuid directly regardless.

[Ryan Hansberry, 2017/02/16 22:42:20]

Fixed after https://codereview.chromium.org/2698473007/

+  if (!network) {
+    return GetNetworkStateFromGuid(service_path);
+  }
   if (network && !network->update_received())
     return nullptr;
   return network;
 }
 
 const NetworkState* NetworkStateHandler::DefaultNetwork() const {
   if (default_network_path_.empty())
     return nullptr;
   return GetNetworkState(default_network_path_);
 }
@@ skipping 69 matching lines @@
 }
 
 void NetworkStateHandler::GetNetworkListByType(const NetworkTypePattern& type,
                                                bool configured_only,
                                                bool visible_only,
                                                int limit,
                                                NetworkStateList* list) {
   DCHECK(list);
   list->clear();
   int count = 0;
+
+  if (NetworkTypePattern::Tether().MatchesPattern(type)) {
+    for (auto iter = tether_network_list_.begin();
+        iter != tether_network_list_.end(); ++iter) {
+      list->push_back((*iter)->AsNetworkState());
+      if (limit > 0 && ++count >= limit)
+        return;
+    }
+  }
+
   // Sort the network list if necessary.
   if (!network_list_sorted_)
     SortNetworkList();
   for (auto iter = network_list_.begin(); iter != network_list_.end(); ++iter) {
     const NetworkState* network = (*iter)->AsNetworkState();
     DCHECK(network);
     if (!network->update_received() || !network->Matches(type))
       continue;
     if (configured_only && !network->IsInProfile())
       continue;
@@ skipping 744 matching lines @@
   if (type.MatchesType(shill::kTypeBluetooth))
     technologies.emplace_back(shill::kTypeBluetooth);
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos