Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3364)

Unified Diff: chrome/browser/resources/help/help.js

Issue 125443002: In-app messaging to communicate the imminent 32-bit deprecation to 32-bit-only users (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/help/help.html ('k') | chrome/browser/ui/startup/obsolete_os_infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/help/help.js
diff --git a/chrome/browser/resources/help/help.js b/chrome/browser/resources/help/help.js
index 547b8054e44b30b5a974e57eceffabc66c4df86f..3d337bf59b2c9e8ae7decc2361568128692d156b 100644
--- a/chrome/browser/resources/help/help.js
+++ b/chrome/browser/resources/help/help.js
@@ -246,6 +246,15 @@ cr.define('help', function() {
* @private
*/
setUpdateStatus_: function(status, message) {
+ if (cr.isMac &&
+ $('update-status-message') &&
+ $('update-status-message').hidden) {
+ // Chrome has reached the end of the line on this system. The
+ // update-obsolete-system message is displayed. No other auto-update
+ // status should be displayed.
+ return;
+ }
+
var channel = this.targetChannel_;
if (status == 'checking') {
this.setUpdateImage_('working');
@@ -341,6 +350,30 @@ cr.define('help', function() {
/**
* @private
*/
+ setObsoleteSystem_: function(obsolete) {
+ if (cr.isMac && $('update-obsolete-system-container')) {
+ $('update-obsolete-system-container').hidden = !obsolete;
+ }
+ },
+
+ /**
+ * @private
+ */
+ setObsoleteSystemEndOfTheLine_: function(endOfTheLine) {
+ if (cr.isMac &&
+ $('update-obsolete-system-container') &&
+ !$('update-obsolete-system-container').hidden &&
+ $('update-status-message')) {
+ $('update-status-message').hidden = endOfTheLine;
+ if (endOfTheLine) {
+ this.setUpdateImage_('failed');
+ }
+ }
+ },
+
+ /**
+ * @private
+ */
setOSVersion_: function(version) {
if (!cr.isChromeOS)
console.error('OS version unsupported on non-CrOS');
@@ -461,8 +494,12 @@ cr.define('help', function() {
HelpPage.getInstance().setPromotionState_(state);
};
- HelpPage.setObsoleteOS = function(obsolete) {
- HelpPage.getInstance().setObsoleteOS_(obsolete);
+ HelpPage.setObsoleteSystem = function(obsolete) {
+ HelpPage.getInstance().setObsoleteSystem_(obsolete);
+ };
+
+ HelpPage.setObsoleteSystemEndOfTheLine = function(endOfTheLine) {
+ HelpPage.getInstance().setObsoleteSystemEndOfTheLine_(endOfTheLine);
};
HelpPage.setOSVersion = function(version) {
« no previous file with comments | « chrome/browser/resources/help/help.html ('k') | chrome/browser/ui/startup/obsolete_os_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698