Add Wimax to ONC.

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 "base/bind.h"
 #include "base/format_macros.h"
 #include "base/guid.h"
 #include "base/location.h"
@@ skipping 545 matching lines @@
     if (ConnectionStateChanged(network, prev_connection_state)) {
       OnNetworkConnectionStateChanged(network);
       // If the connection state changes, other properties such as IPConfig
       // may have changed, so request a full update.
       RequestUpdateForNetwork(service_path);
     }
   } else {
     std::string value_str;
     value.GetAsString(&value_str);
     // Some property changes are noisy and not interesting:
-    // * Wifi SignalStrength
+    // * Wifi or WiMAX SignalStrength
     // * WifiFrequencyList updates
     // * Device property changes to "/" (occurs before a service is removed)
     if (key != shill::kSignalStrengthProperty &&
         key != shill::kWifiFrequencyListProperty &&
         (key != shill::kDeviceProperty || value_str != "/")) {
       std::string log_event = "NetworkPropertyUpdated";
       // Trigger a default network update for interesting changes only.
       if (network->path() == default_network_path_) {
         NotifyDefaultNetworkChanged(network);
         log_event = "Default" + log_event;
@@ skipping 119 matching lines @@
     NotifyDeviceListChanged();
   } else {
     NOTREACHED();
   }
 }
 
 void NetworkStateHandler::SortNetworkList() {
   // Note: usually active networks will precede inactive networks, however
   // this may briefly be untrue during state transitions (e.g. a network may
   // transition to idle before the list is updated).
+  // Handle WiMAX in the same way as WiFi.

[stevenjb, 2014/09/17 16:49:04]

nit: I think we should probably handle Wimax like Cellular, you might want to
check with ben on that.

[pneubeck (no reviews), 2014/09/17 20:10:47]

Sorry, this is a leftover from me debugging the API test.
I think the change in this function should, if at all, happen in a separate CL.

   ManagedStateList active, non_wifi_visible, wifi_visible, hidden, new_networks;
   for (ManagedStateList::iterator iter = network_list_.begin();
        iter != network_list_.end(); ++iter) {
     NetworkState* network = (*iter)->AsNetworkState();
     if (!network->update_received()) {
       new_networks.push_back(network);
       continue;
     }
     if (network->IsConnectedState() || network->IsConnectingState()) {
       active.push_back(network);
       continue;
     }
     if (network->visible()) {
-      if (NetworkTypePattern::WiFi().MatchesType(network->type()))
+      if (NetworkTypePattern::WiFi().MatchesType(network->type()) ||
+          NetworkTypePattern::Wimax().MatchesType(network->type())) {
         wifi_visible.push_back(network);
-      else
+      } else {
         non_wifi_visible.push_back(network);
+      }
     } else {
       hidden.push_back(network);
     }
   }
   network_list_.clear();
   network_list_.insert(network_list_.end(), active.begin(), active.end());
   network_list_.insert(
       network_list_.end(), non_wifi_visible.begin(), non_wifi_visible.end());
   network_list_.insert(
       network_list_.end(), wifi_visible.begin(), wifi_visible.end());
@@ skipping 225 matching lines @@
   if (type.MatchesType(shill::kTypeBluetooth))
     technologies.push_back(new std::string(shill::kTypeBluetooth));
   if (type.MatchesType(shill::kTypeVPN))
     technologies.push_back(new std::string(shill::kTypeVPN));
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies.Pass();
 }
 
 }  // namespace chromeos