Elim 'Translated' from Managed ONC dictionary

chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc

 // Copyright (c) 2014 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_strings.h"
 
 #include "base/macros.h"
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/ash_strings.h"
@@ skipping 30 matching lines @@
     { "addConnectionTitle",
       IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION },
     {"addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI},
     {"addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN},
     {"otherCellularNetworks", IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS},
     {"enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING},
     {"disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING},
     {"dataRoamingDisableToggleTooltip",
      IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION},
 
-    // ONC network states.
-    {"OncStateNotConnected", IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED},
-    {"OncStateConnecting", IDS_CHROMEOS_NETWORK_STATE_CONNECTING},
-    {"OncStateConnected", IDS_CHROMEOS_NETWORK_STATE_CONNECTED},
-    {"OncStateUnknown", IDS_CHROMEOS_NETWORK_STATE_UNKNOWN},
+    // ONC network states. Format is 'Onc' + key + value.
+    // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type
+    {"OncConnectionStateConnected", IDS_CHROMEOS_NETWORK_STATE_CONNECTED},
+    {"OncConnectionStateConnecting", IDS_CHROMEOS_NETWORK_STATE_CONNECTING},
+    {"OncConnectionStateNotConnected",
+     IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED},
+    {"OncConnectionStateUnknown", IDS_CHROMEOS_NETWORK_STATE_UNKNOWN},
+    {"OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR},
+    {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
+    {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
+    {"OncTypeWimax", IDS_NETWORK_TYPE_WIMAX},
+    {"OncVPN-TypeL2TP-IPsecCert",
+     IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT},
+    {"OncVPN-TypeL2TP-IPsecPSK",
+     IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK},
+    {"OncVPN-TypeOpenVPN", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN},
 
     // Internet details dialog.
     {"managedNetwork", IDS_OPTIONS_SETTINGS_MANAGED_NETWORK},
     {"wifiNetworkTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_CONNECTION},
     {"vpnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_VPN},
     {"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},
@@ skipping 118 matching lines @@
   int id;
   if (roaming_state == shill::kRoamingStateHome)
     id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_HOME;
   else if (roaming_state == shill::kRoamingStateRoaming)
     id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING;
   else
     id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_UNKNOWN;
   return l10n_util::GetStringUTF8(id);
 }
 
-std::string ProviderTypeString(
-    const std::string& provider_type,
-    const base::DictionaryValue& provider_properties) {
-  int id;
-  if (provider_type == shill::kProviderL2tpIpsec) {
-    std::string client_cert_id;
-    provider_properties.GetStringWithoutPathExpansion(
-        shill::kL2tpIpsecClientCertIdProperty, &client_cert_id);
-    if (client_cert_id.empty())
-      id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_PSK;
-    else
-      id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_L2TP_IPSEC_USER_CERT;
-  } else if (provider_type == shill::kProviderOpenVpn) {
-    id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_OPEN_VPN;
-  } else {
-    id = IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN;
-  }
-  return l10n_util::GetStringUTF8(id);
-}
-
 std::string RestrictedStateString(const std::string& connection_state) {
   int id;
   if (connection_state == shill::kStatePortal)
     id = IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL;
   else
     id = IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL;
   return l10n_util::GetStringUTF8(id);
 }
 
 std::string NetworkDeviceTypeString(const std::string& network_type) {
   int id;
   if (network_type == shill::kTypeEthernet)
     id = IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET;
   else if (network_type == shill::kTypeWifi)
     id = IDS_STATUSBAR_NETWORK_DEVICE_WIFI;
   else if (network_type == shill::kTypeCellular)
     id = IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR;
   else
     id = IDS_STATUSBAR_NETWORK_DEVICE_UNKNOWN;
   return l10n_util::GetStringUTF8(id);
 }
 
 }  // namespace internet_options_strings
 }  // namespace chromeos