WebUI: Remove i18n from cr_elements/network

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 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/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 18 matching lines @@
 #include "components/password_manager/core/browser/password_manager_constants.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "ui/base/l10n/l10n_util.h"
 
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
 #else
 #include "chrome/browser/ui/webui/settings/system_handler.h"
 #endif
 
 namespace settings {
@@ skipping 1684 matching lines @@
       {"loading", IDS_SETTINGS_LOADING},
       {"advancedFontSettings", IDS_SETTINGS_ADVANCED_FONT_SETTINGS},
       {"openAdvancedFontSettings", IDS_SETTINGS_OPEN_ADVANCED_FONT_SETTINGS},
       {"requiresWebStoreExtension", IDS_SETTINGS_REQUIRES_WEB_STORE_EXTENSION},
       {"quickBrownFox", IDS_SETTINGS_QUICK_BROWN_FOX},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
-}  // namespace
-
 #if defined(OS_CHROMEOS)
-void AddCrNetworkStrings(content::WebUIDataSource* html_source) {
-  LocalizedString localized_strings[] = {
-      {"networkDisabled", IDS_NETWORK_LIST_DISABLED},
-      {"networkListItemConnected", IDS_NETWORK_LIST_CONNECTED},
-      {"networkListItemConnecting", IDS_NETWORK_LIST_CONNECTING},
-      {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
-      {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},
-  };
-  AddLocalizedStringsBulk(html_source, localized_strings,
-                          arraysize(localized_strings));
+void AddOncStrings(content::WebUIDataSource* html_source) {
   LocalizedString onc_property_strings[] = {
       // Thes strings are generated by prepending 'Onc' to the ONC property
       // name. Any '.' in the property name is replaced with '-'. Properties
       // with translatable enumerated values have the value appended after '_'.
       {"OncCellular-APN-AccessPointName",
        IDS_ONC_CELLULAR_APN_ACCESS_POINT_NAME},
       {"OncCellular-APN-AccessPointName_none",
        IDS_ONC_CELLULAR_APN_ACCESS_POINT_NAME_NONE},
       {"OncCellular-APN-Password", IDS_ONC_CELLULAR_APN_PASSWORD},
       {"OncCellular-APN-Username", IDS_ONC_CELLULAR_APN_USERNAME},
@@ skipping 24 matching lines @@
        IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING},
       {"OncCellular-ServingOperator-Code",
        IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE},
       {"OncCellular-ServingOperator-Name",
        IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME},
       {"OncConnected", IDS_ONC_CONNECTED},
       {"OncConnecting", IDS_ONC_CONNECTING},
       {"OncMacAddress", IDS_ONC_MAC_ADDRESS},
       {"OncNotConnected", IDS_ONC_NOT_CONNECTED},
       {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY},
-      {"OncTypeCellular", IDS_SETTINGS_NETWORK_TYPE_CELLULAR},
-      {"OncTypeEthernet", IDS_SETTINGS_NETWORK_TYPE_ETHERNET},
-      {"OncTypeVPN", IDS_SETTINGS_NETWORK_TYPE_VPN},
-      {"OncTypeWiFi", IDS_SETTINGS_NETWORK_TYPE_WIFI},
-      {"OncTypeWiMAX", IDS_SETTINGS_NETWORK_TYPE_WIMAX},
       {"OncVPN-Host", IDS_ONC_VPN_HOST},
       {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME},
       {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME},
       {"OncVPN-ThirdPartyVPN-ProviderName",
        IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME},
       {"OncVPN-Type", IDS_ONC_VPN_TYPE},
       {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY},
       {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY},
       {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH},
       {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY},
       {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY},
       {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS},
       {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
       {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
   };
   AddLocalizedStringsBulk(html_source, onc_property_strings,
                           arraysize(onc_property_strings));
 }
 #endif  // OS_CHROMEOS
 
+}  // namespace
+
 void AddLocalizedStrings(content::WebUIDataSource* html_source,
                          Profile* profile) {
   AddA11yStrings(html_source);
   AddAboutStrings(html_source);
   AddAppearanceStrings(html_source, profile);
   AddClearBrowsingDataStrings(html_source);
   AddCommonStrings(html_source, profile);
   AddDownloadsStrings(html_source);
   AddLanguagesStrings(html_source);
   AddOnStartupStrings(html_source);
   AddPasswordsAndFormsStrings(html_source);
   AddPeopleStrings(html_source);
   AddPrintingStrings(html_source);
   AddPrivacyStrings(html_source, profile);
   AddResetStrings(html_source);
   AddSearchEnginesStrings(html_source);
   AddSearchInSettingsStrings(html_source);
   AddSearchStrings(html_source);
   AddSiteSettingsStrings(html_source, profile);
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
 #if defined(OS_CHROMEOS)
   AddAccountUITweaksStrings(html_source, profile);
   AddAndroidAppStrings(html_source);
   AddBluetoothStrings(html_source);
-  AddCrNetworkStrings(html_source);
   AddDateTimeStrings(html_source);
   AddDeviceStrings(html_source);
   AddEasyUnlockStrings(html_source);
   AddInternetStrings(html_source);
   AddMultiProfilesStrings(html_source, profile);
+  AddOncStrings(html_source);
 #else
   AddDefaultBrowserStrings(html_source);
   AddImportDataStrings(html_source);
   AddSystemStrings(html_source);
 #endif
 
 #if defined(USE_NSS_CERTS)
   AddCertificateManagerStrings(html_source);
 #endif
 
+#if defined(OS_CHROMEOS)
+  chromeos::network_element::AddLocalizedStrings(html_source);
+#endif
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings