summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/webui/options/chromeos/proxy_handler.cc')
-rw-r--r--chrome/browser/ui/webui/options/chromeos/proxy_handler.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
index 567bb96..867ccf3 100644
--- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
@@ -20,8 +20,8 @@
namespace chromeos {
-ProxyHandler::ProxyHandler()
- : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider()) {
+ProxyHandler::ProxyHandler(Profile* profile)
+ : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider(profile)) {
}
ProxyHandler::~ProxyHandler() {
@@ -67,6 +67,16 @@ void ProxyHandler::GetLocalizedValues(
l10n_util::GetStringUTF16(IDS_PROXY_PORT));
localized_strings->SetString("proxyBypass",
l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));
+ localized_strings->SetString("policyManagedPrefsBannerText",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_MANAGED_PREFS));
+ localized_strings->SetString("extensionManagedPrefsBannerText",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS));
+ localized_strings->SetString("unmodifiablePrefsBannerText",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_UNMODIFIABLE_PREFS));
+ localized_strings->SetString("enableSharedProxiesBannerText",
+ l10n_util::GetStringFUTF16(
+ IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,
+ l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
}
void ProxyHandler::SetNetworkName(const std::string& name) {