summaryrefslogtreecommitdiff
path: root/chromium/components/neterror
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-08-01 12:59:39 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:40:43 +0000
commit28b1110370900897ab652cb420c371fab8857ad4 (patch)
tree41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/components/neterror
parent399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff)
downloadqtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions. Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/neterror')
-rw-r--r--chromium/components/neterror/resources/neterror.css5
-rw-r--r--chromium/components/neterror/resources/neterror.html14
-rw-r--r--chromium/components/neterror/resources/offline.js2
3 files changed, 12 insertions, 9 deletions
diff --git a/chromium/components/neterror/resources/neterror.css b/chromium/components/neterror/resources/neterror.css
index 071061411e3..1cbc66cf336 100644
--- a/chromium/components/neterror/resources/neterror.css
+++ b/chromium/components/neterror/resources/neterror.css
@@ -268,6 +268,7 @@ html[subframe] body {
-webkit-justify-content: center;
left: 0;
position: absolute;
+ text-align: center;
top: 0;
transition: background-color .2s ease-in-out;
width: 100%;
@@ -352,6 +353,10 @@ html[subframe] body {
will-change: -webkit-filter, background-color;
}
+.offline #main-message > p {
+ display: none;
+}
+
.offline.inverted {
-webkit-filter: invert(100%);
background-color: #000;
diff --git a/chromium/components/neterror/resources/neterror.html b/chromium/components/neterror/resources/neterror.html
index 47c6945e37a..1128b8e8fa6 100644
--- a/chromium/components/neterror/resources/neterror.html
+++ b/chromium/components/neterror/resources/neterror.html
@@ -19,13 +19,15 @@
<div id="main-message">
<h1 jsselect="heading" jsvalues=".innerHTML:msg"></h1>
<p jsselect="summary" jsvalues=".innerHTML:msg"></p>
- <div id="suggestions-list" jsdisplay="(suggestionsSummaryList && suggestionsSummaryList.length)">
+ <div id="suggestions-list" style="display:none"
+ jsdisplay="(suggestionsSummaryList && suggestionsSummaryList.length)">
<p jsvalues=".innerHTML:suggestionsSummaryListHeader"></p>
<ul jsvalues=".className:suggestionsSummaryList.length == 1 ? 'single-suggestion' : ''">
<li jsselect="suggestionsSummaryList" jsvalues=".innerHTML:summary"></li>
</ul>
</div>
<div class="error-code" jscontent="errorCode"></div>
+ <div id="diagnose-frame" class="hidden"></div>
</div>
</div>
<div id="buttons" class="nav-wrapper">
@@ -60,18 +62,14 @@
<div class="suggestion-header" jsvalues=".innerHTML:header"></div>
<div class="suggestion-body" jsvalues=".innerHTML:body"></div>
</div>
- <button class="text-button" id="diagnose-button"
- onclick="diagnoseErrors()" jscontent="diagnose"
- jsdisplay="diagnose"></button>
- <div id="diagnose-frame" class="hidden"></div>
</div>
</div>
<div id="sub-frame-error">
<!-- Show details when hovering over the icon, in case the details are
hidden because they're too large. -->
- <img class="icon" jseval="updateIconClass(this.classList, iconClass)"
- jsvalues=".title:errorDetails">
- <div id="sub-frame-error-details" jsvalues=".innerHTML:errorDetails"></div>
+ <div class="icon"
+ jseval="updateIconClass(this.classList, iconClass)"></div>
+ <div id="sub-frame-error-details" jsselect="summary" jsvalues=".innerHTML:msg"></div>
</div>
<div id="offline-resources">
diff --git a/chromium/components/neterror/resources/offline.js b/chromium/components/neterror/resources/offline.js
index 21bd2866350..005f4f3ae20 100644
--- a/chromium/components/neterror/resources/offline.js
+++ b/chromium/components/neterror/resources/offline.js
@@ -650,7 +650,7 @@ Runner.prototype = {
*/
onKeyDown: function(e) {
// Prevent native page scrolling whilst tapping on mobile.
- if (IS_MOBILE) {
+ if (IS_MOBILE && this.activated) {
e.preventDefault();
}