Chromium Code Reviews| Index: chrome/browser/resources/extensions/extensions.js |
| diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js |
| index e3d607837c0f262dcd8932ed5c43f8852c2044a9..952397ae62e27d4544bb466ac85b4f007be17661 100644 |
| --- a/chrome/browser/resources/extensions/extensions.js |
| +++ b/chrome/browser/resources/extensions/extensions.js |
| @@ -87,6 +87,14 @@ cr.define('extensions', function() { |
| $('dev-controls').addEventListener('webkitTransitionEnd', |
| this.handleDevControlsTransitionEnd_.bind(this)); |
| + $('unlock-button').onclick = function() { |
|
not at google - send to devlin
2013/02/21 01:29:18
.addEventListener('click', function(){...})
Adrian Kuegel
2013/02/21 10:10:54
Done.
|
| + chrome.send('authenticate'); |
| + }; |
| + |
| + $('lock-button').onclick = function() { |
|
not at google - send to devlin
2013/02/21 01:29:18
ditto
Adrian Kuegel
2013/02/21 10:10:54
Done.
|
| + chrome.send('endAuthentication'); |
| + }; |
| + |
| // Set up the three dev mode buttons (load unpacked, pack and update). |
| $('load-unpacked').addEventListener('click', |
| this.handleLoadUnpackedExtension_.bind(this)); |
| @@ -244,15 +252,18 @@ cr.define('extensions', function() { |
| var pageDiv = $('extension-settings'); |
| var marginTop = 0; |
| - if (extensionsData.profileIsManaged) { |
| + if (extensionsData.profileIsManaged && !extensionsData.profileIsElevated) { |
| pageDiv.classList.add('showing-banner'); |
| pageDiv.classList.add('profile-is-managed'); |
| $('toggle-dev-on').disabled = true; |
| - marginTop += 45; |
| + marginTop += 48; |
| } else { |
| pageDiv.classList.remove('showing-banner'); |
| pageDiv.classList.remove('profile-is-managed'); |
| $('toggle-dev-on').disabled = false; |
| + if (!extensionsData.profileIsManaged) { |
| + pageDiv.classList.add('no-managed-user-controls'); |
| + } |
|
not at google - send to devlin
2013/02/21 01:29:18
I find this more confusing than it needs to be, I
Adrian Kuegel
2013/02/21 10:10:54
I agree, using profile-is-managed instead of no-ma
|
| } |
| if (extensionsData.showDisabledExtensionsWarning) { |
| @@ -262,7 +273,7 @@ cr.define('extensions', function() { |
| } |
| pageDiv.style.marginTop = marginTop + 'px'; |
| - if (extensionsData.developerMode && !extensionsData.profileIsManaged) { |
| + if (extensionsData.developerMode) { |
| pageDiv.classList.add('dev-mode'); |
| $('toggle-dev-on').checked = true; |
| $('dev-controls').hidden = false; |