Merged Tether and cellular network types in System Tray.

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/command_line.h"
@@ skipping 405 matching lines @@
                                                bool visible_only,
                                                int limit,
                                                NetworkStateList* list) {
   DCHECK(list);
   list->clear();
 
   // Sort the network list if necessary.
   if (!network_list_sorted_)
     SortNetworkList();
 
-  if (type.MatchesPattern(NetworkTypePattern::Tether())) {
+  if (type.MatchesPattern(NetworkTypePattern::Tether()) &&
+      IsTechnologyEnabled(NetworkTypePattern::Tether())) {

[khorimoto, 2017/05/30 22:35:16]

I don't think this CL is the right place for this change. Theoretically, if
tether is not enabled, we shouldn't have any networks in tether_network_list_
anyway. If we do want to make this change, we should also add a change which
removes all tether networks from the list when the Tether DeviceState is changed
from "enabled" to another value.

stevenjb@, thoughts? :)

[stevenjb, 2017/05/30 23:23:14]

I think changing the behavior in this CL is OK, but we shouldn't check
IsTechnologyEnabled() here, that's an implementation detail of
GetTetherNetworkList(), which should always return an empty result of Tether is
disabled.

[lesliewatkins, 2017/05/31 00:43:27]

If this change isn't implemented, then the Tether network list appears in the
system tray even when Tether/Mobile is disabled.

[lesliewatkins, 2017/05/31 00:43:59]

Done.

     GetTetherNetworkList(limit, list);
   }
 
   int count = list->size();
 
   if (type.Equals(NetworkTypePattern::Tether()) ||
       (limit != 0 && count >= limit)) {
     // If only searching for Tether networks, there is no need to continue
     // searching through other network types; likewise, if the limit has already
     // been reached, there is no need to continue searching.
@@ skipping 1045 matching lines @@
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
   if (type.MatchesType(kTypeTether))
     technologies.emplace_back(kTypeTether);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos