diff options
Diffstat (limited to 'chromium/chrome/browser/resources/settings/about_page')
5 files changed, 36 insertions, 69 deletions
diff --git a/chromium/chrome/browser/resources/settings/about_page/about_page.js b/chromium/chrome/browser/resources/settings/about_page/about_page.js index d4781a4d1b7..cdb845116be 100644 --- a/chromium/chrome/browser/resources/settings/about_page/about_page.js +++ b/chromium/chrome/browser/resources/settings/about_page/about_page.js @@ -233,8 +233,8 @@ Polymer({ this.regulatoryInfo_ = info; }); - this.aboutBrowserProxy_.getHasEndOfLife().then(result => { - this.hasEndOfLife_ = result; + this.aboutBrowserProxy_.getEndOfLifeInfo().then(result => { + this.hasEndOfLife_ = !!result.hasEndOfLife; }); this.aboutBrowserProxy_.getEnabledReleaseNotes().then(result => { diff --git a/chromium/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js b/chromium/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js index d1f1373396e..1d5eeb7273d 100644 --- a/chromium/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js +++ b/chromium/chrome/browser/resources/settings/about_page/about_page_browser_proxy.js @@ -27,20 +27,19 @@ let ChannelInfo; /** * @typedef {{ - * arcVersion: string, - * osFirmware: string, - * osVersion: string, + * version: (string|undefined), + * size: (string|undefined), * }} */ -let VersionInfo; +let AboutPageUpdateInfo; /** * @typedef {{ - * version: (string|undefined), - * size: (string|undefined), + * hasEndOfLife: (boolean|undefined), + * eolMessageWithMonthAndYear: (string|undefined), * }} */ -let AboutPageUpdateInfo; +let EndOfLifeInfo; /** * Enumeration of all possible browser channels. @@ -200,18 +199,15 @@ cr.define('settings', function() { /** @return {!Promise<!ChannelInfo>} */ getChannelInfo() {} - /** @return {!Promise<!VersionInfo>} */ - getVersionInfo() {} - /** @return {!Promise<?RegulatoryInfo>} */ getRegulatoryInfo() {} /** * Checks if the device has reached end-of-life status and will no longer * receive updates. - * @return {!Promise<boolean>} + * @return {!Promise<!EndOfLifeInfo>} */ - getHasEndOfLife() {} + getEndOfLifeInfo() {} /** * Request TPM firmware update status from the browser. It results in one or @@ -309,18 +305,13 @@ cr.define('settings', function() { } /** @override */ - getVersionInfo() { - return cr.sendWithPromise('getVersionInfo'); - } - - /** @override */ getRegulatoryInfo() { return cr.sendWithPromise('getRegulatoryInfo'); } /** @override */ - getHasEndOfLife() { - return cr.sendWithPromise('getHasEndOfLife'); + getEndOfLifeInfo() { + return cr.sendWithPromise('getEndOfLifeInfo'); } /** @override */ diff --git a/chromium/chrome/browser/resources/settings/about_page/channel_switcher_dialog.html b/chromium/chrome/browser/resources/settings/about_page/channel_switcher_dialog.html index a974334455c..78ac464caad 100644 --- a/chromium/chrome/browser/resources/settings/about_page/channel_switcher_dialog.html +++ b/chromium/chrome/browser/resources/settings/about_page/channel_switcher_dialog.html @@ -19,7 +19,7 @@ <div slot="title">$i18n{aboutChangeChannel}</div> <div slot="body"> <!-- TODO(dbeam): this can be policy-controlled. Show this in the UI. - https://www.chromium.org/administrators/policy-list-3#ChromeOsReleaseChannel + https://cloud.google.com/docs/chrome-enterprise/policies/?policy=ChromeOsReleaseChannel --> <cr-radio-group on-selected-changed="onChannelSelectionChanged_"> <cr-radio-button name="[[browserChannelEnum_.STABLE]]"> diff --git a/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.html b/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.html index 2369486bc71..fa1ae5f812e 100644 --- a/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.html +++ b/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.html @@ -24,15 +24,6 @@ width: 100%; } </style> - <div class="settings-box two-line single-column"> - <div>$i18n{aboutPlatformLabel}</div> - <div class="secondary" id="osVersion">[[versionInfo_.osVersion]]</div> - </div> - <div class="settings-box two-line single-column" - hidden$="[[!shouldShowVersion_(versionInfo_.osFirmware)]]"> - <div>$i18n{aboutFirmwareLabel}</div> - <div class="secondary" id="osFirmware">[[versionInfo_.osFirmware]]</div> - </div> <div class="settings-box two-line"> <div class="start"> <div>$i18n{aboutChannelLabel}</div> @@ -57,29 +48,17 @@ </settings-channel-switcher-dialog> </template> </div> - <div class="settings-box two-line single-column" - hidden$="[[!shouldShowVersion_(versionInfo_.arcVersion)]]"> - <div>$i18n{aboutArcVersionLabel}</div> - <div class="secondary" id="arcVersion">[[versionInfo_.arcVersion]]</div> - </div> - <div class="settings-box two-line single-column"> - <div>V8</div> - <div class="secondary">$i18n{aboutJsEngineVersion}</div> - </div> - <div class="settings-box two-line single-column"> - <div>$i18n{aboutUserAgentLabel}</div> - <div class="secondary">$i18n{aboutUserAgent}</div> - </div> - <div class="settings-box two-line single-column"> - <div>$i18n{aboutCommandLineLabel}</div> - <div id="command-line" class="secondary"> - [[i18n('aboutCommandLine')]] + <div id="endOfLifeSectionContainer" + class="settings-box two-line single-column" + hidden="[[!eolMessageWithMonthAndYear]]"> + <div>$i18n{aboutEndOfLifeTitle}</div> + <div class="secondary" inner-h-t-m-l="[[eolMessageWithMonthAndYear]]"> </div> </div> - <div class="settings-box two-line single-column"> - <div>$i18n{aboutBuildDateLabel}</div> - <div class="secondary">$i18n{aboutBuildDate}</div> - </div> + <cr-link-row class="hr" label="$i18n{aboutBuildDetailsTitle}" + on-click="onBuildDetailsTap_" external> + </cr-link-row> + <div class="hr"></div> </template> <script src="detailed_build_info.js"></script> </dom-module> diff --git a/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.js b/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.js index 18ad3b217ed..ba47cf969b4 100644 --- a/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.js +++ b/chromium/chrome/browser/resources/settings/about_page/detailed_build_info.js @@ -13,9 +13,6 @@ Polymer({ behaviors: [I18nBehavior], properties: { - /** @private {!VersionInfo} */ - versionInfo_: Object, - /** @private */ currentlyOnChannelText_: String, @@ -24,17 +21,17 @@ Polymer({ /** @private */ canChangeChannel_: Boolean, + + eolMessageWithMonthAndYear: { + type: String, + value: '', + }, }, /** @override */ ready: function() { const browserProxy = settings.AboutPageBrowserProxyImpl.getInstance(); browserProxy.pageReady(); - - browserProxy.getVersionInfo().then(versionInfo => { - this.versionInfo_ = versionInfo; - }); - this.updateChannelInfo_(); }, @@ -51,15 +48,6 @@ Polymer({ }, /** - * @param {string} version - * @return {boolean} - * @private - */ - shouldShowVersion_: function(version) { - return version.length > 0; - }, - - /** * @param {boolean} canChangeChannel * @return {string} * @private @@ -93,6 +81,15 @@ Polymer({ this.showChannelSwitcherDialog_ = true; }, + /** + * @param {!Event} e + * @private + */ + onBuildDetailsTap_: function(e) { + e.preventDefault(); + window.open('chrome://version'); + }, + /** @private */ onChannelSwitcherDialogClosed_: function() { this.showChannelSwitcherDialog_ = false; |