Use networkingPrivate.getDeviceState in Internet Settings

chrome/browser/ui/webui/options/chromeos/internet_options_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 "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 88 matching lines @@
 const char kSetNetworkGuidMessage[] = "setNetworkGuid";
 
 // TODO(stevenjb): Deprecate these and integrate with settings Web UI.
 const char kAddVPNConnectionMessage[] = "addVPNConnection";
 const char kAddNonVPNConnectionMessage[] = "addNonVPNConnection";
 const char kConfigureNetworkMessage[] = "configureNetwork";
 
 const char kLoadVPNProviders[] = "loadVPNProviders";
 
 // These are strings used to communicate with JavaScript.
-const char kTagCellularAvailable[] = "cellularAvailable";
-const char kTagCellularEnabled[] = "cellularEnabled";
 const char kTagCellularSimAbsent[] = "cellularSimAbsent";
 const char kTagCellularSimLockType[] = "cellularSimLockType";
 const char kTagCellularSupportsScan[] = "cellularSupportsScan";
 const char kTagRememberedList[] = "rememberedList";
 const char kTagSimOpChangePin[] = "changePin";
 const char kTagSimOpConfigure[] = "configure";
 const char kTagSimOpSetLocked[] = "setLocked";
 const char kTagSimOpSetUnlocked[] = "setUnlocked";
 const char kTagSimOpUnlock[] = "unlock";
 const char kTagVPNProviderName[] = "name";
 const char kTagVPNProviderExtensionID[] = "extensionID";
 const char kTagVpnList[] = "vpnList";
-const char kTagWifiAvailable[] = "wifiAvailable";
-const char kTagWifiEnabled[] = "wifiEnabled";
-const char kTagWimaxAvailable[] = "wimaxAvailable";
-const char kTagWimaxEnabled[] = "wimaxEnabled";
 const char kTagWiredList[] = "wiredList";
 const char kTagWirelessList[] = "wirelessList";
 
 void ShillError(const std::string& function,
                 const std::string& error_name,
                 scoped_ptr<base::DictionaryValue> error_data) {
   // UpdateConnectionData may send requests for stale services; ignore
   // these errors.
   if (function == "UpdateConnectionData" &&
       error_name == network_handler::kDBusFailedError)
@@ skipping 452 matching lines @@
 }
 
 void InternetOptionsHandler::FillNetworkInfo(
     base::DictionaryValue* dictionary) {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   dictionary->Set(kTagWiredList, GetWiredList());
   dictionary->Set(kTagWirelessList, GetWirelessList());
   dictionary->Set(kTagVpnList, GetVPNList());
   dictionary->Set(kTagRememberedList, GetRememberedList());
 
-  dictionary->SetBoolean(
-      kTagWifiAvailable,
-      handler->IsTechnologyAvailable(NetworkTypePattern::WiFi()));
-  dictionary->SetBoolean(
-      kTagWifiEnabled,
-      handler->IsTechnologyEnabled(NetworkTypePattern::WiFi()));
-
   const DeviceState* cellular =
       handler->GetDeviceStateByType(NetworkTypePattern::Mobile());
-  dictionary->SetBoolean(
-      kTagCellularAvailable,
-      handler->IsTechnologyAvailable(NetworkTypePattern::Mobile()));
-  dictionary->SetBoolean(
-      kTagCellularEnabled,
-      handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()));
   dictionary->SetBoolean(kTagCellularSupportsScan,
                          cellular && cellular->support_network_scan());
   dictionary->SetBoolean(kTagCellularSimAbsent,
                          cellular && cellular->IsSimAbsent());
   dictionary->SetString(kTagCellularSimLockType,
                         cellular ? cellular->sim_lock_type() : "");
-
-  dictionary->SetBoolean(
-      kTagWimaxAvailable,
-      handler->IsTechnologyAvailable(NetworkTypePattern::Wimax()));
-  dictionary->SetBoolean(
-      kTagWimaxEnabled,
-      handler->IsTechnologyEnabled(NetworkTypePattern::Wimax()));
 }
 
 }  // namespace options
 }  // namespace chromeos