diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:15:40 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-02 08:41:08 +0000 |
commit | b92421879c003a0857b2074f7e05b3bbbb326569 (patch) | |
tree | bdfd21ad74690ae4069e4a055191844994027b78 /chromium/chrome/browser | |
parent | 980b784afe75be22158126ac6a639c19459d3427 (diff) | |
download | qtwebengine-chromium-b92421879c003a0857b2074f7e05b3bbbb326569.tar.gz |
BASELINE: Update Chromium to 51.0.2704.79
Also adds a few files for url_parsing in extensions.
Change-Id: Ie4820c3da75f0a56b3cc86dccc077d671227077b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'chromium/chrome/browser')
10 files changed, 49 insertions, 19 deletions
diff --git a/chromium/chrome/browser/resources/md_downloads/manager.css b/chromium/chrome/browser/resources/md_downloads/manager.css index 5d089101299..89ff0acf022 100644 --- a/chromium/chrome/browser/resources/md_downloads/manager.css +++ b/chromium/chrome/browser/resources/md_downloads/manager.css @@ -33,6 +33,9 @@ font-size: 123.1%; font-weight: 500; justify-content: center; + /* To avoid overlapping with the header, we need this min-height + * until bug 596743 is fixed. */ + min-height: min-content; } #no-downloads .illustration { diff --git a/chromium/chrome/browser/resources/md_downloads/vulcanized.html b/chromium/chrome/browser/resources/md_downloads/vulcanized.html index 994982244de..0cee1fff399 100644 --- a/chromium/chrome/browser/resources/md_downloads/vulcanized.html +++ b/chromium/chrome/browser/resources/md_downloads/vulcanized.html @@ -2812,6 +2812,9 @@ paper-button { font-size: 123.1%; font-weight: 500; justify-content: center; + /* To avoid overlapping with the header, we need this min-height + * until bug 596743 is fixed. */ + min-height: min-content; } #no-downloads .illustration { diff --git a/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html b/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html index 1c2d42a0b94..2e976cd52d6 100644 --- a/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html +++ b/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html @@ -90,7 +90,8 @@ </template> <template is="dom-if" if="[[!computeRouteDetailsHidden_(currentView_, issue)]]"> - <route-details id="route-details" route="[[currentRoute_]]" + <route-details id="route-details" is-off-the-record="[[isOffTheRecord]]" + route="[[currentRoute_]]" on-close-route-click="onCloseRouteClick_"> </route-details> </template> diff --git a/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js index 12ae40f478c..7aa9e20b2a8 100644 --- a/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js +++ b/chromium/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js @@ -192,6 +192,15 @@ Polymer({ }, /** + * Whether the browser is currently incognito. + * @type {boolean} + */ + isOffTheRecord: { + type: Boolean, + value: false, + }, + + /** * Whether the search input is currently focused. This is used to prevent * window focus/blur events from interfering with input-focus-dependent * operations. diff --git a/chromium/chrome/browser/resources/media_router/elements/route_details/route_details.js b/chromium/chrome/browser/resources/media_router/elements/route_details/route_details.js index 64a50fbd97d..af5d4b11a81 100644 --- a/chromium/chrome/browser/resources/media_router/elements/route_details/route_details.js +++ b/chromium/chrome/browser/resources/media_router/elements/route_details/route_details.js @@ -18,6 +18,15 @@ Polymer({ }, /** + * Whether the browser is currently incognito. + * @type {boolean} + */ + isOffTheRecord: { + type: Boolean, + value: false, + }, + + /** * The route to show. * @type {?media_router.Route} */ @@ -92,7 +101,8 @@ Polymer({ this.route.description) : ''; - if (!this.route || !this.route.customControllerPath) { + if (!this.route || !this.route.customControllerPath || + this.isOffTheRecord) { this.isCustomControllerHidden_ = true; return; } diff --git a/chromium/chrome/browser/resources/media_router/media_router_ui_interface.js b/chromium/chrome/browser/resources/media_router/media_router_ui_interface.js index a19cf3c874e..4d34d68bbef 100644 --- a/chromium/chrome/browser/resources/media_router/media_router_ui_interface.js +++ b/chromium/chrome/browser/resources/media_router/media_router_ui_interface.js @@ -89,17 +89,20 @@ cr.define('media_router.ui', function() { * userDomain: string * }, * routes: !Array<!media_router.Route>, - * castModes: !Array<!media_router.CastMode>}} data + * castModes: !Array<!media_router.CastMode>, + * isOffTheRecord: boolean}} data * Parameters in data: * deviceMissingUrl - url to be opened on "Device missing?" clicked. * sinksAndIdentity - list of sinks to be displayed and user identity. * routes - list of routes that are associated with the sinks. * castModes - list of available cast modes. + * isOffTheRecord - whether or not the browser is currently incognito. */ function setInitialData(data) { container.deviceMissingUrl = data['deviceMissingUrl']; container.castModeList = data['castModes']; this.setSinkListAndIdentity(data['sinksAndIdentity']); + container.isOffTheRecord = data['isOffTheRecord']; container.routeList = data['routes']; container.maybeShowRouteDetailsOnOpen(); media_router.browserApi.onInitialDataReceived(); diff --git a/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json b/chromium/chrome/browser/resources/plugin_metadata/plugins_linux.json index 35dbf1052b5..62d3421fe8a 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": 12, + "x-version": 14, "google-talk": { "mime_types": [ ], @@ -80,9 +80,9 @@ ], "versions": [ { - "version": "20.0.0.306", + "version": "21.0.0.242", "status": "up_to_date", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-04.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-15.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 853ad38c0bd..eaee4e7c5dc 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": 18, + "x-version": 20, "google-talk": { "mime_types": [ ], @@ -115,9 +115,9 @@ ], "versions": [ { - "version": "20.0.0.306", + "version": "21.0.0.242", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-04.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-15.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 3c8870a051b..e5e91cd106c 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": 27, + "x-version": 29, "google-talk": { "mime_types": [ ], @@ -137,9 +137,9 @@ ], "versions": [ { - "version": "20.0.0.306", + "version": "21.0.0.242", "status": "requires_authorization", - "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-04.html" + "reference": "https://helpx.adobe.com/security/products/flash-player/apsb16-15.html" } ], "lang": "en-US", diff --git a/chromium/chrome/browser/resources/print_preview/data/destination_store.js b/chromium/chrome/browser/resources/print_preview/data/destination_store.js index ef00b686462..acbfae03878 100644 --- a/chromium/chrome/browser/resources/print_preview/data/destination_store.js +++ b/chromium/chrome/browser/resources/print_preview/data/destination_store.js @@ -1249,6 +1249,8 @@ cr.define('print_preview', function() { */ onLocalDestinationCapabilitiesSet_: function(event) { var destinationId = event.settingsInfo['printerId']; + var printerName = event.settingsInfo['printerName']; + var printerDescription = event.settingsInfo['printerDescription']; var key = this.getDestinationKey_( print_preview.Destination.Origin.LOCAL, destinationId, @@ -1272,20 +1274,19 @@ cr.define('print_preview', function() { } destination.capabilities = capabilities; } else { - // TODO(rltoscano): This makes the assumption that the "deviceName" is - // the same as "printerName". We should include the "printerName" in - // the response. See http://crbug.com/132831. destination = print_preview.LocalDestinationParser.parse( - {deviceName: destinationId, printerName: destinationId}); + {deviceName: destinationId, + printerName: printerName, + printerDescription: printerDescription}); destination.capabilities = capabilities; this.insertDestination_(destination); } } if (this.selectedDestination_ && this.selectedDestination_.id == destinationId) { - cr.dispatchSimpleEvent(this, - DestinationStore.EventType. - SELECTED_DESTINATION_CAPABILITIES_READY); + cr.dispatchSimpleEvent( + this, + DestinationStore.EventType.SELECTED_DESTINATION_CAPABILITIES_READY); } }, |