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()))
     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.
     return;
   }
@@ skipping 15 matching lines @@
     }
     if (limit > 0 && ++count >= limit)
       break;
   }
 }
 
 void NetworkStateHandler::GetTetherNetworkList(int limit,
                                                NetworkStateList* list) {
   DCHECK(list);
   list->clear();
+
+  if (!IsTechnologyEnabled(NetworkTypePattern::Tether()))
+    return;
+
   int count = 0;
-
   for (auto iter = tether_network_list_.begin();
        iter != tether_network_list_.end(); ++iter) {
     list->push_back((*iter)->AsNetworkState());
     if (limit > 0 && ++count >= limit)
       return;
   }
 }
 
 const NetworkState* NetworkStateHandler::GetNetworkStateFromServicePath(
     const std::string& service_path,
@@ skipping 1006 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