-
+
diff --git a/chrome/browser/resources/options/chromeos/proxy_options.js b/chrome/browser/resources/options/chromeos/proxy_options.js
index 537e2f93255797..6af0804c4e57a8 100644
--- a/chrome/browser/resources/options/chromeos/proxy_options.js
+++ b/chrome/browser/resources/options/chromeos/proxy_options.js
@@ -181,6 +181,16 @@ cr.define('options', function() {
for (var x = 0; x < selectedItems.length; x++) {
$('ignoredHostList').removeException(selectedItems[x]);
}
+ },
+
+ /**
+ * Sets proxy page title using given network name.
+ * @param {string} network The network name to use in page title.
+ * @public
+ */
+ setNetworkName: function(network) {
+ $('proxy-page-title').textContent =
+ localStrings.getStringF('proxyPageTitleFormat', network);
}
};
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 9d1027cbff3900..afc7f6a7c55a14 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -115,6 +115,9 @@ void InternetOptionsHandler::GetLocalizedValues(
localized_strings->SetString("changeProxyButton",
l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CHANGE_PROXY_BUTTON));
+ localized_strings->SetString("enableSharedProxiesHint",
+ l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT));
localized_strings->SetString("wifiNetworkTabLabel",
l10n_util::GetStringUTF16(
@@ -687,10 +690,14 @@ void InternetOptionsHandler::PopulateDictionaryDetails(
dictionary.SetBoolean("connected", network->connected());
dictionary.SetString("connectionState", network->GetStateString());
bool remembered = (network->profile_type() != chromeos::PROFILE_NONE);
- dictionary.SetBoolean("proxyConfigurable",
+ bool proxy_configurable =
(remembered && (network->profile_type() == chromeos::PROFILE_USER ||
use_shared_proxies)) ||
- (type == chromeos::TYPE_ETHERNET && use_shared_proxies));
+ (type == chromeos::TYPE_ETHERNET && use_shared_proxies);
+ dictionary.SetBoolean("proxyConfigurable", proxy_configurable);
+ dictionary.SetBoolean("showSharedProxiesHint",
+ !proxy_configurable && !use_shared_proxies &&
+ (remembered || type == chromeos::TYPE_ETHERNET));
// Hide the dhcp/static radio if not ethernet or wifi (or if not enabled)
bool staticIPConfig = CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
index d375c560b3cbf5..ed91179a0a9a28 100644
--- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc
@@ -33,6 +33,8 @@ void ProxyHandler::GetLocalizedValues(
// Proxy page - ChromeOS
localized_strings->SetString("proxyPage",
l10n_util::GetStringUTF16(IDS_OPTIONS_PROXY_TAB_LABEL));
+ localized_strings->SetString("proxyPageTitleFormat",
+ l10n_util::GetStringUTF16(IDS_PROXY_PAGE_TITLE_FORMAT));
localized_strings->SetString("proxy_config_title",
l10n_util::GetStringUTF16(IDS_PROXY_CONFIG_TITLE));
localized_strings->SetString("proxyDirectInternetConnection",