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

Unified Diff: chrome/browser/resources/settings/about_page/about_page.js

Issue 2873193002: Make update over cellular an option for user (Closed)
Patch Set: Put code in CHROME_OS wrapper to fix trybot error Created 3 years, 7 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
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..54ca31e5695f2b294c6a18bbac756df54bc4b0a6 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js
@@ -6,6 +6,7 @@
* @fileoverview 'settings-about-page' contains version and OS related
* information.
*/
+
Polymer({
is: 'settings-about-page',
@@ -84,7 +85,16 @@ Polymer({
'#detailed-build-info-trigger');
return map;
},
- }
+ },
+
+ /** @private */
+ showUpdateWarningDialog_: {
+ type: Boolean,
+ value: false,
+ },
+
+ /** @private {!AboutPageUpdateInfo|undefined} */
+ updateInfo_: Object,
// </if>
},
@@ -163,6 +173,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 +272,13 @@ Polymer({
switch (this.currentUpdateStatusEvent_.status) {
case UpdateStatus.CHECKING:
return this.i18n('aboutUpgradeCheckStarted');
+ case UpdateStatus.NEED_PERMISSION_TO_UPDATE:
+ // This status is immediately followed by an reporting error status.
+ // When update engine reports error, UI just shows that your device is
+ // up to date. This is a bug that needs to be fixed in the future.
+ // TODO(weidongg/581071): Show proper message when update engine aborts
+ // due to cellular connection.
+ return '';
case UpdateStatus.NEARLY_UPDATED:
// <if expr="chromeos">
if (this.currentChannel_ != this.targetChannel_)
@@ -399,7 +420,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 +431,11 @@ Polymer({
shouldShowRegulatoryInfo_: function() {
return this.regulatoryInfo_ !== null;
},
+
+ /** @private */
+ onUpdateWarningDialogClose_: function() {
+ this.showUpdateWarningDialog_ = false;
+ },
// </if>
/** @private */

Powered by Google App Engine
This is Rietveld 408576698