From 6c91641271e536ffaa88a1dff5127e42ee99a91e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 25 Jan 2016 11:39:07 +0100 Subject: BASELINE: Update Chromium to 49.0.2623.23 Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen --- chromium/chrome/browser/resources/help/help_page.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'chromium/chrome/browser/resources/help/help_page.js') diff --git a/chromium/chrome/browser/resources/help/help_page.js b/chromium/chrome/browser/resources/help/help_page.js index d3d53dc50c5..4269098fc15 100644 --- a/chromium/chrome/browser/resources/help/help_page.js +++ b/chromium/chrome/browser/resources/help/help_page.js @@ -165,7 +165,9 @@ cr.define('help', function() { var logo = $('product-logo'); logo.onclick = function(e) { logo.classList.remove('spin'); - setTimeout(function() { logo.classList.add('spin'); }, 0); + // Force a style recalc that cancels the animation specified by "spin". + getComputedStyle(logo).getPropertyValue('animation-name'); + logo.classList.add('spin'); }; // Attempt to update. @@ -330,6 +332,9 @@ cr.define('help', function() { } else if (status == 'failed') { this.setUpdateImage_('failed'); $('update-status-message').innerHTML = message; + } else if (status == 'disabled_by_admin') { + this.setUpdateImage_('disabled-by-admin'); + $('update-status-message').innerHTML = message; } if (cr.isChromeOS) { @@ -427,7 +432,7 @@ cr.define('help', function() { * @private */ setObsoleteSystem_: function(obsolete) { - if (cr.isMac && $('update-obsolete-system-container')) { + if ($('update-obsolete-system-container')) { $('update-obsolete-system-container').hidden = !obsolete; } }, @@ -438,8 +443,7 @@ cr.define('help', function() { * @private */ setObsoleteSystemEndOfTheLine_: function(endOfTheLine) { - if (cr.isMac && - $('update-obsolete-system-container') && + if ($('update-obsolete-system-container') && !$('update-obsolete-system-container').hidden && $('update-status-message')) { $('update-status-message').hidden = endOfTheLine; -- cgit v1.2.1