Index: chrome/browser/resources/options/language_options.js |
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js |
index 3ebf7d2665bf940e57089ced80f1c3b0ec0fc568..4792e1c01a29b263ffbeb566870a52e1a5965b64 100644 |
--- a/chrome/browser/resources/options/language_options.js |
+++ b/chrome/browser/resources/options/language_options.js |
@@ -557,6 +557,11 @@ cr.define('options', function() { |
// hidden by a language change. |
uiLanguageButton.hidden = false; |
+ // Hide the controlled setting indicator. |
+ var uiLanguageIndicator = document.querySelector( |
+ '.language-options-contents .controlled-setting-indicator'); |
+ uiLanguageIndicator.removeAttribute('controlled-by'); |
+ |
if (languageCode == this.prospectiveUiLanguageCode_) { |
uiLanguageMessage.textContent = |
loadTimeData.getString('isDisplayedInThisLanguage'); |
@@ -571,11 +576,17 @@ cr.define('options', function() { |
} else { |
uiLanguageButton.textContent = |
loadTimeData.getString('displayInThisLanguage'); |
+ |
+ if (loadTimeData.getBoolean('secondaryUser')) { |
+ uiLanguageButton.disabled = true; |
+ uiLanguageIndicator.setAttribute('controlled-by', 'shared'); |
+ } else { |
+ uiLanguageButton.onclick = function(e) { |
+ chrome.send('uiLanguageChange', [languageCode]); |
+ }; |
+ } |
showMutuallyExclusiveNodes( |
[uiLanguageButton, uiLanguageMessage, uiLanguageNotification], 0); |
- uiLanguageButton.onclick = function(e) { |
- chrome.send('uiLanguageChange', [languageCode]); |
- }; |
} |
} else { |
uiLanguageMessage.textContent = |