Chromium Code Reviews| Index: chrome/browser/resources/settings/about_page/about_page.js |
| diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js |
| index 2e5464e0d1f8849ed2554c2dd1ff30d9c888a045..b6be4608cb9d7969341cfc03075446f85af03fe9 100644 |
| --- a/chrome/browser/resources/settings/about_page/about_page.js |
| +++ b/chrome/browser/resources/settings/about_page/about_page.js |
| @@ -1,7 +1,6 @@ |
| // Copyright 2016 The Chromium Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| - |
|
xiyuan
2017/05/11 20:37:25
nit: restore this empty line and insert one after
|
| /** |
| * @fileoverview 'settings-about-page' contains version and OS related |
| * information. |
| @@ -84,7 +83,16 @@ Polymer({ |
| '#detailed-build-info-trigger'); |
| return map; |
| }, |
| - } |
| + }, |
| + |
| + /** @private */ |
| + showUpdateWarningDialog_: { |
| + type: Boolean, |
| + value: false, |
| + }, |
| + |
| + /** @private {!AboutPageUpdateInfo|undefined} */ |
| + updateInfo_: Object, |
| // </if> |
| }, |
| @@ -163,6 +171,10 @@ Polymer({ |
| // <if expr="chromeos"> |
| if (event.status == UpdateStatus.CHECKING) |
| this.hasCheckedForUpdates_ = true; |
| + else if (event.status == UpdateStatus.NEED_PERMISSION_TO_UPDATE) { |
| + this.showUpdateWarningDialog_ = true; |
| + this.updateInfo_ = {version: event.version, size: event.size}; |
| + } |
| // </if> |
| this.currentUpdateStatusEvent_ = event; |
| }, |
| @@ -258,6 +270,8 @@ Polymer({ |
| switch (this.currentUpdateStatusEvent_.status) { |
| case UpdateStatus.CHECKING: |
| return this.i18n('aboutUpgradeCheckStarted'); |
| + case UpdateStatus.NEED_PERMISSION_TO_UPDATE: |
| + return ""; |
|
xiyuan
2017/05/11 20:37:25
If this is intended, please document why. Otherwis
stevenjb
2017/05/11 21:03:45
Also use '' not "" (but it seems like we should ha
weidongg
2017/05/11 23:50:44
This transition is IDLE->CHECKING_FOR_UPDATE->NEED
|
| case UpdateStatus.NEARLY_UPDATED: |
| // <if expr="chromeos"> |
| if (this.currentChannel_ != this.targetChannel_) |
| @@ -399,7 +413,8 @@ Polymer({ |
| var staleUpdatedStatus = !this.hasCheckedForUpdates_ && |
| this.checkStatus_(UpdateStatus.UPDATED); |
| - return staleUpdatedStatus || this.checkStatus_(UpdateStatus.FAILED); |
| + return staleUpdatedStatus || this.checkStatus_(UpdateStatus.FAILED) || |
| + this.checkStatus_(UpdateStatus.NEED_PERMISSION_TO_UPDATE); |
| }, |
| /** |
| @@ -409,6 +424,11 @@ Polymer({ |
| shouldShowRegulatoryInfo_: function() { |
| return this.regulatoryInfo_ !== null; |
| }, |
| + |
| + /** @private */ |
| + onUpdateWarningDialogClose_: function() { |
| + this.showUpdateWarningDialog_ = false; |
| + }, |
| // </if> |
| /** @private */ |