Add network settings to Wifi tab.

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 291 matching lines @@
     { "disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING },
     { "dataRoamingDisableToggleTooltip",
       IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION },
     { "activateNetwork", IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE },
 
     // Internet details dialog.
 
     { "changeProxyButton",
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CHANGE_PROXY_BUTTON },
     { "managedNetwork", IDS_OPTIONS_SETTINGS_MANAGED_NETWORK },
-    { "wifiNetworkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_WIFI },
+    { "wifiNetworkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION },
     { "vpnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_VPN },
     { "cellularPlanTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_PLAN },
     { "cellularConnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION },
     { "cellularDeviceTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_DEVICE },
     { "networkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_NETWORK },
     { "securityTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_SECURITY },
     { "proxyTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_PROXY },
     { "useDHCP", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USE_DHCP },
     { "useStaticIP", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USE_STATIC_IP },
     { "connectionState", IDS_OPTIONS_SETTINGS_INTERNET_CONNECTION_STATE },
     { "inetAddress", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ADDRESS },
     { "inetSubnetAddress", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SUBNETMASK },
     { "inetGateway", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY },
     { "inetDns", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER },
     { "hardwareAddress",
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS },
     { "detailsInternetDismiss", IDS_CLOSE },
     { "activateButton", IDS_OPTIONS_SETTINGS_ACTIVATE },
     { "buyplanButton", IDS_OPTIONS_SETTINGS_BUY_PLAN },
     { "connectButton", IDS_OPTIONS_SETTINGS_CONNECT },
     { "disconnectButton", IDS_OPTIONS_SETTINGS_DISCONNECT },
     { "viewAccountButton", IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT },
 
     // Wifi Tab.
 
     { "accessLockedMsg", IDS_STATUSBAR_NETWORK_LOCKED },
     { "inetSsid", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID },
+    { "inetEncryption",
+       IDS_OPTIONS_SETTIGNS_INTERNET_OPTIONS_NETWORK_ENCRYPTION },
     { "inetPassProtected",
        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NET_PROTECTED },
     { "inetNetworkShared",
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_SHARED },
     { "inetPreferredNetwork",
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PREFER_NETWORK },
     { "inetAutoConnectNetwork",
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT },
     { "inetLogin", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN },
     { "inetShowPass", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHOWPASSWORD },
@@ skipping 531 matching lines @@
 }
 
 void InternetOptionsHandler::PopulateWifiDetails(
     const chromeos::WifiNetwork* wifi,
     DictionaryValue* dictionary) {
   dictionary->SetString("ssid", wifi->name());
   bool remembered = (wifi->profile_type() != chromeos::PROFILE_NONE);
   dictionary->SetBoolean("remembered", remembered);
   bool shared = wifi->profile_type() == chromeos::PROFILE_SHARED;
   dictionary->SetBoolean("shared", shared);
+  dictionary->SetString("encryption", wifi->GetEncryptionString());
 }
 
 DictionaryValue* InternetOptionsHandler::CreateDictionaryFromCellularApn(
     const chromeos::CellularApn& apn) {
   DictionaryValue* dictionary = new DictionaryValue();
   dictionary->SetString("apn", apn.apn);
   dictionary->SetString("networkId", apn.network_id);
   dictionary->SetString("username", apn.username);
   dictionary->SetString("password", apn.password);
   dictionary->SetString("name", apn.name);
@@ skipping 380 matching lines @@
   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