Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2528803002: MD Settings: Internet: Add/fix remaining policy items (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 {"networkProxyAllowShared", 794 {"networkProxyAllowShared",
795 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, 795 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED},
796 {"networkProxyAllowSharedWarningTitle", 796 {"networkProxyAllowSharedWarningTitle",
797 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITLE}, 797 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITLE},
798 {"networkProxyAllowSharedWarningMessage", 798 {"networkProxyAllowSharedWarningMessage",
799 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESSAGE}, 799 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESSAGE},
800 {"networkProxyAutoConfig", 800 {"networkProxyAutoConfig",
801 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG}, 801 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},
802 {"networkProxyConnectionType", 802 {"networkProxyConnectionType",
803 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE}, 803 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE},
804 {"networkProxyControlledExtension",
805 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION},
806 {"networkProxyEnforcedPolicy", 804 {"networkProxyEnforcedPolicy",
807 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY}, 805 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY},
808 {"networkProxyExceptionList", 806 {"networkProxyExceptionList",
809 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST}, 807 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST},
810 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY}, 808 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY},
811 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY}, 809 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY},
812 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT}, 810 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT},
813 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY}, 811 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY},
814 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST}, 812 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST},
815 {"networkProxyTypeDirect", 813 {"networkProxyTypeDirect",
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1830 #if defined(USE_NSS_CERTS) 1828 #if defined(USE_NSS_CERTS)
1831 AddCertificateManagerStrings(html_source); 1829 AddCertificateManagerStrings(html_source);
1832 #endif 1830 #endif
1833 1831
1834 policy_indicator::AddLocalizedStrings(html_source); 1832 policy_indicator::AddLocalizedStrings(html_source);
1835 1833
1836 html_source->SetJsonPath(kLocalizedStringsFile); 1834 html_source->SetJsonPath(kLocalizedStringsFile);
1837 } 1835 }
1838 1836
1839 } // namespace settings 1837 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698