Index: chrome/browser/ui/webui/options/chromeos/proxy_handler.cc |
=================================================================== |
--- chrome/browser/ui/webui/options/chromeos/proxy_handler.cc (revision 108608) |
+++ chrome/browser/ui/webui/options/chromeos/proxy_handler.cc (working copy) |
@@ -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 @@ |
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) { |