From 818d9aed569afd192f6d4f6d9b28b72912df8b93 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 8 Mar 2018 13:07:32 +0100 Subject: BASELINE: Update Chromium to 65.0.3325.151 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3c71dd500483eb29491ac3eee4123714dda52da9 Reviewed-by: Michael Brüning --- .../resources/chromeos/zip_archiver/manifest.json | 3 +- .../resources/plugin_metadata/plugins_linux.json | 6 +- .../resources/plugin_metadata/plugins_mac.json | 6 +- .../resources/plugin_metadata/plugins_win.json | 6 +- .../resources/print_preview/print_preview.js | 3 +- .../resources/settings/about_page/about_page.html | 28 +++++++-- .../resources/settings/about_page/about_page.js | 72 ++++++++++++++++++++-- .../about_page/about_page_browser_proxy.js | 12 ++++ .../chrome/browser/resources/settings/icons.html | 1 + .../settings/internet_page/compiled_resources2.gyp | 1 + .../settings/internet_page/internet_config.html | 11 +++- .../settings/internet_page/internet_config.js | 21 ++++++- .../settings/internet_page/internet_page.js | 4 ++ .../internet_page/tether_connection_dialog.js | 5 +- .../browser/resources/welcome/welcome_win10.html | 13 +++- .../browser/resources/welcome/welcome_win10.js | 11 ++-- 16 files changed, 171 insertions(+), 32 deletions(-) (limited to 'chromium/chrome/browser/resources') diff --git a/chromium/chrome/browser/resources/chromeos/zip_archiver/manifest.json b/chromium/chrome/browser/resources/chromeos/zip_archiver/manifest.json index 3478c1cc9d3..456a43640de 100644 --- a/chromium/chrome/browser/resources/chromeos/zip_archiver/manifest.json +++ b/chromium/chrome/browser/resources/chromeos/zip_archiver/manifest.json @@ -22,7 +22,8 @@ "directory" ] }, - "notifications" + "notifications", + "storage" ], "file_system_provider_capabilities": { "multipleMounts": true, diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json index 99b6cf673f3..9d4b50b6b41 100644 --- a/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json +++ b/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json @@ -1,5 +1,5 @@ { - "x-version": 26, + "x-version": 28, "google-talk": { "mime_types": [ ], @@ -80,9 +80,9 @@ ], "versions": [ { - "version": "27.0.0.187", + "version": "28.0.0.161", "status": "up_to_date", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-33.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-03.html" } ], "lang": "en-US", diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json index a85342825f9..5a7f063708f 100644 --- a/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json +++ b/chromium/chrome/browser/resources/plugin_metadata/plugins_mac.json @@ -1,5 +1,5 @@ { - "x-version": 32, + "x-version": 34, "google-talk": { "mime_types": [ ], @@ -115,9 +115,9 @@ ], "versions": [ { - "version": "27.0.0.187", + "version": "28.0.0.161", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-33.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-03.html" } ], "lang": "en-US", diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json index c5b325b08c2..4d356b256f0 100644 --- a/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json +++ b/chromium/chrome/browser/resources/plugin_metadata/plugins_win.json @@ -1,5 +1,5 @@ { - "x-version": 41, + "x-version": 43, "google-talk": { "mime_types": [ ], @@ -137,9 +137,9 @@ ], "versions": [ { - "version": "27.0.0.187", + "version": "28.0.0.161", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb17-33.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb18-03.html" } ], "lang": "en-US", diff --git a/chromium/chrome/browser/resources/print_preview/print_preview.js b/chromium/chrome/browser/resources/print_preview/print_preview.js index 0a8f1d34329..918f2ad7db4 100644 --- a/chromium/chrome/browser/resources/print_preview/print_preview.js +++ b/chromium/chrome/browser/resources/print_preview/print_preview.js @@ -566,7 +566,8 @@ cr.define('print_preview', function() { } const destination = assert(this.destinationStore_.selectedDestination); const whenPrintDone = this.sendPrintRequest_(destination); - if (destination.isLocal) { + if (destination.isLocal || + this.uiState_ == PrintPreviewUiState_.OPENING_PDF_PREVIEW) { const onError = destination.id == print_preview.Destination.GooglePromotedId.SAVE_AS_PDF ? this.onFileSelectionCancel_.bind(this) : diff --git a/chromium/chrome/browser/resources/settings/about_page/about_page.html b/chromium/chrome/browser/resources/settings/about_page/about_page.html index 42a110c6acf..4f2f097bbe7 100644 --- a/chromium/chrome/browser/resources/settings/about_page/about_page.html +++ b/chromium/chrome/browser/resources/settings/about_page/about_page.html @@ -96,12 +96,22 @@
+ a new line after "getThrobberSrcIfUpdating_(", causes incorrect + src URL --> +
+ + + + +
$i18n{aboutBrowserVersion}
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 beecac15534..d2dbea9b66e 100644 --- a/chromium/chrome/browser/resources/settings/about_page/about_page.js +++ b/chromium/chrome/browser/resources/settings/about_page/about_page.js @@ -34,6 +34,9 @@ Polymer({ /** @private {?RegulatoryInfo} */ regulatoryInfo_: Object, + + /** @private */ + hasEndOfLife_: Boolean, // // @@ -41,6 +44,7 @@ Polymer({ promoteUpdaterStatus_: Object, // + // /** @private {!{obsolete: boolean, endOfLine: boolean}} */ obsoleteSystemInfo_: { type: Object, @@ -51,6 +55,7 @@ Polymer({ }; }, }, + // /** @private */ showUpdateStatus_: Boolean, @@ -73,7 +78,7 @@ Polymer({ showCheckUpdates_: { type: Boolean, computed: 'computeShowCheckUpdates_(' + - 'currentUpdateStatusEvent_, hasCheckedForUpdates_)', + 'currentUpdateStatusEvent_, hasCheckedForUpdates_, hasEndOfLife_)', }, /** @private {!Map} */ @@ -117,7 +122,7 @@ Polymer({ // 'updateShowUpdateStatus_(' + - 'obsoleteSystemInfo_, currentUpdateStatusEvent_,' + + 'hasEndOfLife_, currentUpdateStatusEvent_,' + 'hasCheckedForUpdates_)', 'updateShowRelaunch_(currentUpdateStatusEvent_, targetChannel_,' + 'currentChannel_)', @@ -155,6 +160,10 @@ Polymer({ this.aboutBrowserProxy_.getRegulatoryInfo().then(info => { this.regulatoryInfo_ = info; }); + + this.aboutBrowserProxy_.getHasEndOfLife().then(result => { + this.hasEndOfLife_ = result; + }); // // this.startListening_(); @@ -250,10 +259,22 @@ Polymer({ this.showUpdateStatus_ = false; return; } + + // Do not show "updated" status if the device is end of life. + if (this.hasEndOfLife_) { + this.showUpdateStatus_ = false; + return; + } + // + + // + if (this.obsoleteSystemInfo_.endOfLine) { + this.showUpdateStatus_ = false; + return; + } // this.showUpdateStatus_ = - this.currentUpdateStatusEvent_.status != UpdateStatus.DISABLED && - !this.obsoleteSystemInfo_.endOfLine; + this.currentUpdateStatusEvent_.status != UpdateStatus.DISABLED; }, /** @@ -353,11 +374,21 @@ Polymer({ * @return {?string} * @private */ - getIcon_: function() { + getUpdateStatusIcon_: function() { + // + // If Chrome OS has reached end of life, display a special icon and + // ignore UpdateStatus. + if (this.hasEndOfLife_) { + return 'settings:end-of-life'; + } + // + + // // If this platform has reached the end of the line, display an error icon // and ignore UpdateStatus. if (this.obsoleteSystemInfo_.endOfLine) return 'settings:error'; + // switch (this.currentUpdateStatusEvent_.status) { case UpdateStatus.DISABLED_BY_ADMIN: @@ -376,9 +407,17 @@ Polymer({ * @return {?string} * @private */ - getIconSrc_: function() { + getThrobberSrcIfUpdating_: function() { + // + if (this.hasEndOfLife_) { + return null; + } + // + + // if (this.obsoleteSystemInfo_.endOfLine) return null; + // switch (this.currentUpdateStatusEvent_.status) { case UpdateStatus.CHECKING: @@ -440,6 +479,11 @@ Polymer({ * @private */ computeShowCheckUpdates_: function() { + // Disable update button if the device is end of life. + if (this.hasEndOfLife_) { + return false; + } + // Enable the update button if we are in a stale 'updated' status or // update has failed. Disable it otherwise. const staleUpdatedStatus = @@ -501,4 +545,20 @@ Polymer({ this.aboutBrowserProxy_.openFeedbackDialog(); }, // + + /** + * @return {boolean} + * @private + */ + shouldShowIcons_: function() { + // + if (this.hasEndOfLife_) + return true; + // + // + if (this.obsoleteSystemInfo_.endOfLine) + return true; + // + return this.showUpdateStatus_; + }, }); 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 78a656563a1..c074d7e2c16 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 @@ -197,6 +197,13 @@ cr.define('settings', function() { /** @return {!Promise} */ getRegulatoryInfo() {} + /** + * Checks if the device has reached end-of-life status and will no longer + * receive updates. + * @return {!Promise} + */ + getHasEndOfLife() {} + /** * Request TPM firmware update status from the browser. It results in one or * more 'tpm-firmware-update-status-changed' WebUI events. @@ -278,6 +285,11 @@ cr.define('settings', function() { return cr.sendWithPromise('getRegulatoryInfo'); } + /** @override */ + getHasEndOfLife() { + return cr.sendWithPromise('getHasEndOfLife'); + } + /** @override */ refreshTPMFirmwareUpdateStatus() { chrome.send('refreshTPMFirmwareUpdateStatus'); diff --git a/chromium/chrome/browser/resources/settings/icons.html b/chromium/chrome/browser/resources/settings/icons.html index 5c035d852d8..c15dd7ba4a7 100644 --- a/chromium/chrome/browser/resources/settings/icons.html +++ b/chromium/chrome/browser/resources/settings/icons.html @@ -126,6 +126,7 @@ List icons here rather than importing large sets of (e.g. Polymer) icons. + diff --git a/chromium/chrome/browser/resources/settings/internet_page/compiled_resources2.gyp b/chromium/chrome/browser/resources/settings/internet_page/compiled_resources2.gyp index 7ffb7c767f7..cec4fe353b2 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/compiled_resources2.gyp +++ b/chromium/chrome/browser/resources/settings/internet_page/compiled_resources2.gyp @@ -37,6 +37,7 @@ '<(DEPTH)/ui/webui/resources/cr_elements/cr_dialog/compiled_resources2.gyp:cr_dialog', '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', + '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util', '<(EXTERNS_GYP):networking_private', '<(INTERFACES_GYP):networking_private_interface', ], diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_config.html b/chromium/chrome/browser/resources/settings/internet_page/internet_config.html index 22a7b87c97c..4fa0a79d5e8 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_config.html +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_config.html @@ -14,6 +14,11 @@ dialog { width: 460px; } + + .error { + color: red; + font-weight: 500; + } @@ -26,11 +31,15 @@ enable-connect="{{enableConnect_}}" enable-save="{{enableSave_}}" share-allow-enable="[[shareAllowEnable_]]" share-default="[[shareDefault_]]" + error="{{error_}}" on-close="close">
-
+
+ $i18n{cancel} diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_config.js b/chromium/chrome/browser/resources/settings/internet_page/internet_config.js index b77d68088b9..b6bda81171f 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_config.js +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_config.js @@ -69,6 +69,15 @@ Polymer({ * @private {!chrome.networkingPrivate.NetworkProperties} */ networkProperties_: Object, + + /** + * Set by network-config when a configuration error occurs. + * @private + */ + error_: { + type: String, + value: '', + }, }, open: function() { @@ -100,11 +109,21 @@ Polymer({ getDialogTitle_: function() { const name = this.networkProperties_.Name; if (name) - return this.i18n('internetConfigName', name); + return this.i18n('internetConfigName', HTMLEscape(name)); const type = this.i18n('OncType' + this.networkProperties_.Type); return this.i18n('internetJoinType', type); }, + /** + * @return {string} + * @private + */ + getError_: function() { + if (this.i18nExists(this.error_)) + return this.i18n(this.error_); + return this.i18n('networkErrorUnknown'); + }, + /** * @return {boolean} * @private diff --git a/chromium/chrome/browser/resources/settings/internet_page/internet_page.js b/chromium/chrome/browser/resources/settings/internet_page/internet_page.js index b834ac31498..3b8126607c7 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/internet_page.js +++ b/chromium/chrome/browser/resources/settings/internet_page/internet_page.js @@ -283,6 +283,10 @@ Polymer({ * @private */ showConfig_: function(type, guid, name) { + if (!loadTimeData.getBoolean('networkSettingsConfig')) { + chrome.send('configureNetwork', [guid]); + return; + } const configDialog = /** @type {!InternetConfigElement} */ (this.$.configDialog); configDialog.type = diff --git a/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.js b/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.js index 00a9bc025b7..a6bc7f9fef8 100644 --- a/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.js +++ b/chromium/chrome/browser/resources/settings/internet_page/tether_connection_dialog.js @@ -138,7 +138,8 @@ Polymer({ */ getExplanation_: function(networkProperties) { return this.i18n( - 'tetherConnectionExplanation', CrOnc.getNetworkName(networkProperties)); + 'tetherConnectionExplanation', + CrOnc.getEscapedNetworkName(networkProperties)); }, /** @@ -149,7 +150,7 @@ Polymer({ getDescriptionTitle_: function(networkProperties) { return this.i18n( 'tetherConnectionDescriptionTitle', - CrOnc.getNetworkName(networkProperties)); + CrOnc.getEscapedNetworkName(networkProperties)); }, /** diff --git a/chromium/chrome/browser/resources/welcome/welcome_win10.html b/chromium/chrome/browser/resources/welcome/welcome_win10.html index a7003874889..84b8c28c5a0 100644 --- a/chromium/chrome/browser/resources/welcome/welcome_win10.html +++ b/chromium/chrome/browser/resources/welcome/welcome_win10.html @@ -8,9 +8,12 @@ + + + - + @@ -18,6 +21,8 @@ + +