Settings: Internet: Update proxy controlled indicator and fields.

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 781 matching lines @@
       {"networkIPConfigAuto",
        IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
       {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
       {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
       {"networkProxyAddException",
        IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
       {"networkProxyAutoConfig",
        IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},
       {"networkProxyConnectionType",
        IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE},
-      {"networkProxyEnforced", IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED},
+      {"networkProxyControlledExtension",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION},
+      {"networkProxyEnforcedPolicy",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY},
       {"networkProxyExceptionList",
        IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST},
       {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY},
       {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY},
       {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT},
       {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY},
       {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST},
+      {"networkProxyTypeDirect",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT},
+      {"networkProxyTypeManual",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL},
+      {"networkProxyTypePac", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC},
+      {"networkProxyTypeWpad", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD},
       {"networkProxyUseSame", IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME},
       {"networkSectionAccessPoint",
        IDS_SETTINGS_INTERNET_NETWORK_SECTION_ACCESS_POINT},
       {"networkSectionAdvanced",
        IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED},
       {"networkSectionAdvancedExpandA11yLabel",
        IDS_SETTINGS_INTERNET_NETWORK_SECTION_EXPAND_ACCESSIBILITY_LABEL},
       {"networkSectionNameservers",
        IDS_SETTINGS_INTERNET_NETWORK_SECTION_NAMESERVERS},
       {"networkSectionNetwork", IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK},
@@ skipping 988 matching lines @@
 #if defined(USE_NSS_CERTS)
   AddCertificateManagerStrings(html_source);
 #endif
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings