Don't re-sort Chrome OS wifi network list

ash/system/network/network_list.cc

 // Copyright 2016 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 "ash/system/network/network_list.h"
 
 #include <memory>
+#include <utility>
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
 #include "ash/system/network/network_icon_animation.h"
 #include "ash/system/network/network_info.h"
 #include "ash/system/network/network_state_list_detailed_view.h"
 #include "ash/system/networking_config_delegate.h"
@@ skipping 302 matching lines @@
   // Add Tether networks.
   NetworkStateHandler::NetworkStateList tether_network_list;
   handler->GetVisibleNetworkListByType(NetworkTypePattern::Tether(),
                                        &tether_network_list);
   for (const auto* tether_network : tether_network_list) {
     network_list_.push_back(
         base::MakeUnique<NetworkInfo>(tether_network->guid()));
   }
 
   UpdateNetworkIcons();
-  OrderNetworks();
   UpdateNetworkListInternal();
 }
 
 bool NetworkListView::IsNetworkEntry(views::View* view,
                                      std::string* guid) const {
   std::map<views::View*, std::string>::const_iterator found =
       network_map_.find(view);
   if (found == network_map_.end())
     return false;
   *guid = found->second;
@@ skipping 16 matching lines @@
 
     // Do not add Wi-Fi networks that are associated with a Tether network.
     if (NetworkTypePattern::WiFi().MatchesType(network->type()) &&
         !network->tether_guid().empty())
       continue;
 
     network_list_.push_back(base::MakeUnique<NetworkInfo>(network->guid()));
   }
 }
 
-void NetworkListView::OrderNetworks() {
-  struct CompareNetwork {
-    explicit CompareNetwork(NetworkStateHandler* handler) : handler_(handler) {}
-
-    // Returns true if |network1| is less than (i.e. is ordered before)
-    // |network2|.
-    bool operator()(const std::unique_ptr<NetworkInfo>& network1,
-                    const std::unique_ptr<NetworkInfo>& network2) {
-      const int order1 =
-          GetOrder(handler_->GetNetworkStateFromGuid(network1->guid));
-      const int order2 =
-          GetOrder(handler_->GetNetworkStateFromGuid(network2->guid));
-      if (order1 != order2)
-        return order1 < order2;
-      if (network1->connected != network2->connected)
-        return network1->connected;
-      if (network1->connecting != network2->connecting)
-        return network1->connecting;
-      return network1->guid.compare(network2->guid) < 0;
-    }
-
-   private:
-    static int GetOrder(const chromeos::NetworkState* network) {
-      if (!network)
-        return 999;
-      if (network->Matches(NetworkTypePattern::Ethernet()))
-        return 0;
-      if (network->Matches(NetworkTypePattern::Cellular()))
-        return 1;
-      if (network->Matches(NetworkTypePattern::Mobile()))
-        return 2;
-      if (network->Matches(NetworkTypePattern::WiFi()))
-        return 3;

[stevenjb, 2017/06/12 22:26:19]

IIRC, Shill already provides this ordering for unconnected networks, correct?

[Kevin Cernekee, 2017/06/12 22:30:24]

Yes, it sorts by technology before considering strength.

-      return 4;
-    }
-
-    NetworkStateHandler* handler_;
-  };
-  std::sort(network_list_.begin(), network_list_.end(),
-            CompareNetwork(NetworkHandler::Get()->network_state_handler()));
-}
-
 void NetworkListView::UpdateNetworkIcons() {
   SCOPED_NET_LOG_IF_SLOW();
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
 
   // First, update state for all networks.
   bool animating = false;
 
   for (auto& info : network_list_) {
     const chromeos::NetworkState* network =
         handler->GetNetworkStateFromGuid(info->guid);
@@ skipping 368 matching lines @@
       TriView::Container::CENTER, views::CreateEmptyBorder(gfx::Insets(
                                       0, 0, 0, kTrayPopupLabelRightPadding)));
 
   // Nothing to the right of the text.
   connection_warning->SetContainerVisible(TriView::Container::END, false);
   return connection_warning;
 }
 
 }  // namespace tray
 }  // namespace ash