Fixed enable/disable handling for WiMAX. Removed Cellular section when not available.

chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.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/options2/chromeos/internet_options_handler2.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 458 matching lines @@
   web_ui()->RegisterMessageCallback("setIPConfig",
       base::Bind(&InternetOptionsHandler::SetIPConfigCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("enableWifi",
       base::Bind(&InternetOptionsHandler::EnableWifiCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("disableWifi",
       base::Bind(&InternetOptionsHandler::DisableWifiCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("enableCellular",
-      base::Bind(&InternetOptionsHandler::EnableMobileCallback,
+      base::Bind(&InternetOptionsHandler::EnableCellularCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("disableCellular",
-      base::Bind(&InternetOptionsHandler::DisableMobileCallback,
+      base::Bind(&InternetOptionsHandler::DisableCellularCallback,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("enableWimax",
+      base::Bind(&InternetOptionsHandler::EnableWimaxCallback,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("disableWimax",
+      base::Bind(&InternetOptionsHandler::DisableWimaxCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("buyDataPlan",
       base::Bind(&InternetOptionsHandler::BuyDataPlanCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("showMorePlanInfo",
       base::Bind(&InternetOptionsHandler::ShowMorePlanInfoCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setApn",
       base::Bind(&InternetOptionsHandler::SetApnCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setSimCardLock",
       base::Bind(&InternetOptionsHandler::SetSimCardLockCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("changePin",
       base::Bind(&InternetOptionsHandler::ChangePinCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("toggleAirplaneMode",
       base::Bind(&InternetOptionsHandler::ToggleAirplaneModeCallback,
                  base::Unretained(this)));
 }
 
 void InternetOptionsHandler::EnableWifiCallback(const ListValue* args) {
   cros_->EnableWifiNetworkDevice(true);
 }
 
 void InternetOptionsHandler::DisableWifiCallback(const ListValue* args) {
   cros_->EnableWifiNetworkDevice(false);
 }
 
-void InternetOptionsHandler::EnableMobileCallback(const ListValue* args) {
+void InternetOptionsHandler::EnableCellularCallback(const ListValue* args) {
   // TODO(nkostylev): Code duplication, see NetworkMenu::ToggleCellular().
   const chromeos::NetworkDevice* mobile = cros_->FindMobileDevice();
   if (!mobile) {
     LOG(ERROR) << "Didn't find mobile device, it should have been available.";
-    cros_->EnableMobileNetworkDevice(true);
+    cros_->EnableCellularNetworkDevice(true);
   } else if (!mobile->is_sim_locked()) {
     if (mobile->is_sim_absent()) {
       std::string setup_url;
       chromeos::MobileConfig* config = chromeos::MobileConfig::GetInstance();
       if (config->IsReady()) {
         const chromeos::MobileConfig::LocaleConfig* locale_config =
             config->GetLocaleConfig();
         if (locale_config)
           setup_url = locale_config->setup_url();
       }
       if (!setup_url.empty()) {
         GetAppropriateBrowser()->ShowSingletonTab(GURL(setup_url));
       } else {
         // TODO(nkostylev): Show generic error message. http://crosbug.com/15444
       }
     } else {
-      cros_->EnableMobileNetworkDevice(true);
+      cros_->EnableCellularNetworkDevice(true);
     }
   } else {
     chromeos::SimDialogDelegate::ShowDialog(GetNativeWindow(),
         chromeos::SimDialogDelegate::SIM_DIALOG_UNLOCK);
   }
 }
 
-void InternetOptionsHandler::DisableMobileCallback(const ListValue* args) {
-  cros_->EnableMobileNetworkDevice(false);
+void InternetOptionsHandler::DisableCellularCallback(const ListValue* args) {
+  cros_->EnableCellularNetworkDevice(false);
+}
+
+void InternetOptionsHandler::EnableWimaxCallback(const ListValue* args) {
+  cros_->EnableWimaxNetworkDevice(true);
+}
+
+void InternetOptionsHandler::DisableWimaxCallback(const ListValue* args) {
+  cros_->EnableWimaxNetworkDevice(false);
 }
 
 void InternetOptionsHandler::ShowMorePlanInfoCallback(const ListValue* args) {
   if (!web_ui())
     return;
   Browser* browser = browser::FindBrowserWithFeature(
       Profile::FromWebUI(web_ui()), Browser::FEATURE_TABSTRIP);
   if (!browser)
     return;
 
@@ skipping 842 matching lines @@
 
 void InternetOptionsHandler::FillNetworkInfo(DictionaryValue* dictionary) {
   dictionary->SetBoolean("accessLocked", cros_->IsLocked());
   dictionary->Set("wiredList", GetWiredList());
   dictionary->Set("wirelessList", GetWirelessList());
   dictionary->Set("vpnList", GetVPNList());
   dictionary->Set("rememberedList", GetRememberedList());
   dictionary->SetBoolean("wifiAvailable", cros_->wifi_available());
   dictionary->SetBoolean("wifiBusy", cros_->wifi_busy());
   dictionary->SetBoolean("wifiEnabled", cros_->wifi_enabled());
-  dictionary->SetBoolean("cellularAvailable", cros_->mobile_available());
-  dictionary->SetBoolean("cellularBusy", cros_->mobile_busy());
-  dictionary->SetBoolean("cellularEnabled", cros_->mobile_enabled());
+  dictionary->SetBoolean("cellularAvailable", cros_->cellular_available());
+  dictionary->SetBoolean("cellularBusy", cros_->cellular_busy());
+  dictionary->SetBoolean("cellularEnabled", cros_->cellular_enabled());
+  dictionary->SetBoolean("wimaxEnabled", cros_->wimax_enabled());
+  dictionary->SetBoolean("wimaxAvailable", cros_->wimax_available());
+  dictionary->SetBoolean("wimaxBusy", cros_->wimax_busy());
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
   dictionary->SetBoolean("airplaneMode", cros_->offline_mode());
 }
 
 void InternetOptionsHandler::SetValueDictionary(
     DictionaryValue* settings,
     const char* key,
     base::Value* value,
     const chromeos::NetworkPropertyUIData& ui_data) {
   DictionaryValue* value_dict = new DictionaryValue();
   // DictionaryValue::Set() takes ownership of |value|.
   if (value)
     value_dict->Set("value", value);
   const base::Value* default_value = ui_data.default_value();
   if (default_value)
     value_dict->Set("default", default_value->DeepCopy());
   if (ui_data.managed())
     value_dict->SetString("controlledBy", "policy");
   else if (ui_data.recommended())
     value_dict->SetString("controlledBy", "recommended");
   settings->Set(key, value_dict);
 }
 
 }  // namespace options2