| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide
r.h" | 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide
r.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/i18n/number_formatting.h" | 10 #include "base/i18n/number_formatting.h" |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 {"networkProxyAllowShared", | 798 {"networkProxyAllowShared", |
| 799 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, | 799 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, |
| 800 {"networkProxyAllowSharedWarningTitle", | 800 {"networkProxyAllowSharedWarningTitle", |
| 801 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITLE}, | 801 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITLE}, |
| 802 {"networkProxyAllowSharedWarningMessage", | 802 {"networkProxyAllowSharedWarningMessage", |
| 803 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESSAGE}, | 803 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESSAGE}, |
| 804 {"networkProxyAutoConfig", | 804 {"networkProxyAutoConfig", |
| 805 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG}, | 805 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG}, |
| 806 {"networkProxyConnectionType", | 806 {"networkProxyConnectionType", |
| 807 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE}, | 807 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE}, |
| 808 {"networkProxyControlledExtension", | |
| 809 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION}, | |
| 810 {"networkProxyEnforcedPolicy", | 808 {"networkProxyEnforcedPolicy", |
| 811 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY}, | 809 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY}, |
| 812 {"networkProxyExceptionList", | 810 {"networkProxyExceptionList", |
| 813 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST}, | 811 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST}, |
| 814 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY}, | 812 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY}, |
| 815 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY}, | 813 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY}, |
| 816 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT}, | 814 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT}, |
| 817 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY}, | 815 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY}, |
| 818 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST}, | 816 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST}, |
| 819 {"networkProxyTypeDirect", | 817 {"networkProxyTypeDirect", |
| (...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1819 #if defined(USE_NSS_CERTS) | 1817 #if defined(USE_NSS_CERTS) |
| 1820 AddCertificateManagerStrings(html_source); | 1818 AddCertificateManagerStrings(html_source); |
| 1821 #endif | 1819 #endif |
| 1822 | 1820 |
| 1823 policy_indicator::AddLocalizedStrings(html_source); | 1821 policy_indicator::AddLocalizedStrings(html_source); |
| 1824 | 1822 |
| 1825 html_source->SetJsonPath(kLocalizedStringsFile); | 1823 html_source->SetJsonPath(kLocalizedStringsFile); |
| 1826 } | 1824 } |
| 1827 | 1825 |
| 1828 } // namespace settings | 1826 } // namespace settings |
| OLD | NEW |