| Index: chrome/browser/resources/history/history.js
|
| diff --git a/chrome/browser/resources/history/history.js b/chrome/browser/resources/history/history.js
|
| index 6471089713b6dc028f976c0e707e06641b004a9e..b22977e4eab37be5d349967b6a826cb23270c280 100644
|
| --- a/chrome/browser/resources/history/history.js
|
| +++ b/chrome/browser/resources/history/history.js
|
| @@ -1476,14 +1476,14 @@ function load() {
|
| if (loadTimeData.getBoolean('isManagedProfile')) {
|
| $('allow-selected').hidden = false;
|
| $('block-selected').hidden = false;
|
| - $('lock-unlock-button').classList.add('profile-is-managed');
|
| -
|
| - $('lock-unlock-button').addEventListener('click', function(e) {
|
| - var isLocked = document.body.classList.contains('managed-user-locked');
|
| - chrome.send('setManagedUserElevated', [isLocked]);
|
| - });
|
| -
|
| - chrome.send('getManagedUserElevated');
|
| + if (!cr.isChromeOS) {
|
| + $('lock-unlock-button').classList.add('profile-is-managed');
|
| + $('lock-unlock-button').addEventListener('click', function(e) {
|
| + var isLocked = document.body.classList.contains('managed-user-locked');
|
| + chrome.send('setManagedUserElevated', [isLocked]);
|
| + });
|
| + chrome.send('getManagedUserElevated');
|
| + }
|
| }
|
|
|
| var title = loadTimeData.getString('title');
|
| @@ -1840,7 +1840,8 @@ function updateEntries(entries) {
|
| function managedUserElevated(isElevated) {
|
| if (isElevated) {
|
| document.body.classList.remove('managed-user-locked');
|
| - $('lock-unlock-button').textContent = loadTimeData.getString('lockButton');
|
| + $('lock-unlock-button').textContent =
|
| + loadTimeData.getString('lockButton');
|
| } else {
|
| document.body.classList.add('managed-user-locked');
|
| $('lock-unlock-button').textContent =
|
|
|