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

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

Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields. (Closed)
Patch Set: Created 4 years, 1 month 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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 {"networkIPConfigAuto", 762 {"networkIPConfigAuto",
763 IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO}, 763 IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
764 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER}, 764 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
765 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY}, 765 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
766 {"networkProxyAddException", 766 {"networkProxyAddException",
767 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION}, 767 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
768 {"networkProxyAutoConfig", 768 {"networkProxyAutoConfig",
769 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG}, 769 IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},
770 {"networkProxyConnectionType", 770 {"networkProxyConnectionType",
771 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE}, 771 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE},
772 {"networkProxyEnforced", IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED}, 772 {"networkProxyControlledExtension",
773 IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION},
774 {"networkProxyEnforcedPolicy",
775 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY},
773 {"networkProxyExceptionList", 776 {"networkProxyExceptionList",
774 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST}, 777 IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST},
775 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY}, 778 {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY},
776 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY}, 779 {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY},
777 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT}, 780 {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT},
778 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY}, 781 {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY},
779 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST}, 782 {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST},
783 {"networkProxyTypeDirect",
784 IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT},
785 {"networkProxyTypeManual",
786 IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL},
787 {"networkProxyTypePac", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC},
788 {"networkProxyTypeWpad", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD},
780 {"networkProxyUseSame", IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME}, 789 {"networkProxyUseSame", IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME},
781 {"networkSectionAccessPoint", 790 {"networkSectionAccessPoint",
782 IDS_SETTINGS_INTERNET_NETWORK_SECTION_ACCESS_POINT}, 791 IDS_SETTINGS_INTERNET_NETWORK_SECTION_ACCESS_POINT},
783 {"networkSectionAdvanced", 792 {"networkSectionAdvanced",
784 IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED}, 793 IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED},
785 {"networkSectionAdvancedExpandA11yLabel", 794 {"networkSectionAdvancedExpandA11yLabel",
786 IDS_SETTINGS_INTERNET_NETWORK_SECTION_EXPAND_ACCESSIBILITY_LABEL}, 795 IDS_SETTINGS_INTERNET_NETWORK_SECTION_EXPAND_ACCESSIBILITY_LABEL},
787 {"networkSectionNameservers", 796 {"networkSectionNameservers",
788 IDS_SETTINGS_INTERNET_NETWORK_SECTION_NAMESERVERS}, 797 IDS_SETTINGS_INTERNET_NETWORK_SECTION_NAMESERVERS},
789 {"networkSectionNetwork", IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK}, 798 {"networkSectionNetwork", IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK},
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1766 #endif 1775 #endif
1767 AddUsersStrings(html_source); 1776 AddUsersStrings(html_source);
1768 AddWebContentStrings(html_source); 1777 AddWebContentStrings(html_source);
1769 1778
1770 policy_indicator::AddLocalizedStrings(html_source); 1779 policy_indicator::AddLocalizedStrings(html_source);
1771 1780
1772 html_source->SetJsonPath(kLocalizedStringsFile); 1781 html_source->SetJsonPath(kLocalizedStringsFile);
1773 } 1782 }
1774 1783
1775 } // namespace settings 1784 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698