Index: chrome/browser/resources/extensions/extensions.js |
diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js |
index fbf7b3cb2a4dcc18f7b7bbd05364d9aa12e2ac26..418bfbe4568c06a37c09c73134959ee004706e80 100644 |
--- a/chrome/browser/resources/extensions/extensions.js |
+++ b/chrome/browser/resources/extensions/extensions.js |
@@ -196,6 +196,8 @@ cr.define('extensions', function() { |
/** @const */ |
var supervised = profileInfo.isSupervised; |
+ var developerModeDisabledByPolicy = profileInfo. |
Bernhard Bauer
2016/11/25 15:43:35
Ugh. Can you break after the equals sign?
pmarko
2016/11/28 14:19:30
Done.
|
+ isDeveloperModeDisabledByPolicy; |
var pageDiv = $('extension-settings'); |
pageDiv.classList.toggle('profile-is-supervised', supervised); |
@@ -203,7 +205,13 @@ cr.define('extensions', function() { |
var devControlsCheckbox = $('toggle-dev-on'); |
devControlsCheckbox.checked = profileInfo.inDeveloperMode; |
- devControlsCheckbox.disabled = supervised; |
+ devControlsCheckbox.disabled = |
+ supervised || developerModeDisabledByPolicy; |
+ |
+ // This is necessary e.g. if developer mode is now disabled by policy |
+ // but extension developer tools were visible |
+ this.updateDevControlsVisibility_(true); |
+ this.setDevToggleControlledIndicator_(developerModeDisabledByPolicy); |
$('load-unpacked').disabled = !profileInfo.canLoadUnpacked; |
var extensionList = $('extension-settings-list'); |
@@ -219,6 +227,31 @@ cr.define('extensions', function() { |
}, |
/** |
+ * Shows or hides the 'controlled by policy' indicator on the dev-toggle |
+ * checkbox. |
+ * @param {boolean} developerModeDisabledByPolicy true if the indicator |
+ * should be showing. |
+ * @private |
+ */ |
+ setDevToggleControlledIndicator_: function(developerModeDisabledByPolicy) { |
+ var devToggleControlledIndicator = document.querySelector( |
+ '#dev-toggle .controlled-setting-indicator'); |
+ |
+ if (!(devToggleControlledIndicator instanceof cr.ui.ControlledIndicator)) |
+ cr.ui.ControlledIndicator.decorate(devToggleControlledIndicator); |
+ |
+ if (developerModeDisabledByPolicy) { |
+ var controlledBy = 'policy'; |
+ devToggleControlledIndicator.setAttribute('controlled-by', |
+ controlledBy); |
+ devToggleControlledIndicator.setAttribute('text' + controlledBy, |
+ loadTimeData.getString('controlledSettingPolicy')); |
+ } |
+ else |
Bernhard Bauer
2016/11/25 15:43:35
If the if-clause uses braces, so should the else.
pmarko
2016/11/28 14:19:30
Done.
|
+ devToggleControlledIndicator.removeAttribute('controlled-by'); |
+ }, |
+ |
+ /** |
* Shows the loading spinner and hides elements that shouldn't be visible |
* while loading. |
* @param {boolean} isLoading |