OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/options/chromeos/proxy_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 { "secureHttpProxy", IDS_PROXY_HTTP_SECURE_HTTP_PROXY }, | 41 { "secureHttpProxy", IDS_PROXY_HTTP_SECURE_HTTP_PROXY }, |
42 { "ftpProxy", IDS_PROXY_FTP_PROXY }, | 42 { "ftpProxy", IDS_PROXY_FTP_PROXY }, |
43 { "socksHost", IDS_PROXY_SOCKS_HOST }, | 43 { "socksHost", IDS_PROXY_SOCKS_HOST }, |
44 { "proxyAutomatic", IDS_PROXY_AUTOMATIC }, | 44 { "proxyAutomatic", IDS_PROXY_AUTOMATIC }, |
45 { "proxyConfigUrl", IDS_PROXY_CONFIG_URL }, | 45 { "proxyConfigUrl", IDS_PROXY_CONFIG_URL }, |
46 { "advancedProxyConfig", IDS_PROXY_ADVANCED_CONFIG }, | 46 { "advancedProxyConfig", IDS_PROXY_ADVANCED_CONFIG }, |
47 { "addHost", IDS_PROXY_ADD_HOST }, | 47 { "addHost", IDS_PROXY_ADD_HOST }, |
48 { "removeHost", IDS_PROXY_REMOVE_HOST }, | 48 { "removeHost", IDS_PROXY_REMOVE_HOST }, |
49 { "proxyPort", IDS_PROXY_PORT }, | 49 { "proxyPort", IDS_PROXY_PORT }, |
50 { "proxyBypass", IDS_PROXY_BYPASS }, | 50 { "proxyBypass", IDS_PROXY_BYPASS }, |
51 { "policyManagedPrefsBannerText", IDS_OPTIONS_POLICY_MANAGED_PREFS }, | 51 { "proxyBannerPolicy", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_POLICY }, |
52 { "extensionManagedPrefsBannerText", IDS_OPTIONS_EXTENSION_MANAGED_PREFS }, | 52 { "proxyBannerExtension", |
53 { "unmodifiablePrefsBannerText", IDS_OPTIONS_UNMODIFIABLE_PREFS } | 53 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_EXTENSION }, |
| 54 { "proxyBannerOther", |
| 55 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_OTHER_PRECEDE } |
54 }; | 56 }; |
55 | 57 |
56 RegisterStrings(localized_strings, resources, arraysize(resources)); | 58 RegisterStrings(localized_strings, resources, arraysize(resources)); |
57 | 59 |
58 localized_strings->SetString("enableSharedProxiesBannerText", | 60 localized_strings->SetString("proxyBannerShared", |
59 l10n_util::GetStringFUTF16( | 61 l10n_util::GetStringFUTF16( |
60 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT, | 62 IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PROXY_ENABLE_SHARED_HINT, |
61 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES))); | 63 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES))); |
62 } | 64 } |
63 | 65 |
64 } // namespace options | 66 } // namespace options |
65 } // namespace chromeos | 67 } // namespace chromeos |
OLD | NEW |