Commit e75488de authored by Cathy Li's avatar Cathy Li Committed by Commit Bot

[Offline pages]: Remove alternate net error page styling for offline page buttons.

The experiment was not successful and we decided to not pursue this route further
in favor of better experiences.

Change-Id: I6922b0784049eabda8175b04e423e7e83d5d0de1
Reviewed-on: https://chromium-review.googlesource.com/1147093
Commit-Queue: Cathy Li <chili@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Reviewed-by: default avatarEdward Jung <edwardjung@chromium.org>
Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarPeter Williamson <petewil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578481}
parent 9bdd96b6
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#endif #endif
#if defined(OS_ANDROID)
#include "components/offline_pages/core/offline_page_feature.h"
#endif
namespace error_page { namespace error_page {
namespace { namespace {
...@@ -1077,15 +1073,6 @@ void LocalizedError::GetStrings( ...@@ -1077,15 +1073,6 @@ void LocalizedError::GetStrings(
error_strings->SetPath({"downloadButton", "disabledMsg"}, error_strings->SetPath({"downloadButton", "disabledMsg"},
base::Value(l10n_util::GetStringUTF16( base::Value(l10n_util::GetStringUTF16(
IDS_ERRORPAGES_BUTTON_DOWNLOADING))); IDS_ERRORPAGES_BUTTON_DOWNLOADING)));
if (offline_pages::ShouldShowAlternateDinoPage()) {
// Under the experiment, we will show a disabled reload button
// in addition to an enabled download button.
error_strings->SetPath(
{"reloadButton", "msg"},
base::Value(l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD)));
error_strings->SetKey("alternateDownloadButtonStyle", base::Value(true));
}
} }
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
} }
......
...@@ -344,7 +344,7 @@ html[subframe] body { ...@@ -344,7 +344,7 @@ html[subframe] body {
height: 48px; height: 48px;
} }
.download-button { #download-button {
box-shadow: none; box-shadow: none;
position: relative; position: relative;
} }
...@@ -362,7 +362,7 @@ html[subframe] body { ...@@ -362,7 +362,7 @@ html[subframe] body {
vertical-align: middle; vertical-align: middle;
} }
.download-button:disabled { #download-button:disabled {
background: rgb(180, 206, 249); background: rgb(180, 206, 249);
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
} }
...@@ -375,45 +375,6 @@ html[subframe] body { ...@@ -375,45 +375,6 @@ html[subframe] body {
height: 48px; height: 48px;
} }
/* Overriding default control button styles */
#control-buttons .download-button-alternate,
#control-buttons .download-button-alternate-disabled {
background: none;
box-shadow: none;
}
#control-buttons .download-button-alternate:active {
background: rgba(66, 133, 244, 0.12);
}
.download-button-alternate {
color: rgb(66, 133, 244);
}
.download-button-alternate:before {
margin-inline-end: 4px;
background: -webkit-image-set(
url(../../resources/default_100_percent/neterror/download_blue.png) 1x,
url(../../resources/default_200_percent/neterror/download_blue.png) 2x)
no-repeat;
content: '';
display: inline-block;
width: 24px;
height: 24px;
vertical-align: middle;
}
.download-button-alternate-disabled {
color: rgba(0, 0, 0, 0.38);
}
.download-button-alternate-disabled:before {
background: -webkit-image-set(
url(../../resources/default_100_percent/neterror/download_grey.png) 1x,
url(../../resources/default_200_percent/neterror/download_grey.png) 2x)
no-repeat;
}
#buttons::after { #buttons::after {
clear: both; clear: both;
content: ''; content: '';
......
...@@ -118,9 +118,6 @@ function downloadButtonClick() { ...@@ -118,9 +118,6 @@ function downloadButtonClick() {
if (window.errorPageController) { if (window.errorPageController) {
errorPageController.downloadButtonClick(); errorPageController.downloadButtonClick();
var downloadButton = document.getElementById('download-button'); var downloadButton = document.getElementById('download-button');
if (downloadButton.classList.contains('download-button-alternate')) {
downloadButton.classList.add('download-button-alternate-disabled');
}
downloadButton.disabled = true; downloadButton.disabled = true;
downloadButton.textContent = downloadButton.disabledText; downloadButton.textContent = downloadButton.disabledText;
} }
...@@ -202,16 +199,6 @@ function onDocumentLoad() { ...@@ -202,16 +199,6 @@ function onDocumentLoad() {
detailsButton.classList.add('singular'); detailsButton.classList.add('singular');
} }
// Check for customization of downloadButton style if it's visible.
if (downloadButtonVisible &&
loadTimeData.valueExists('alternateDownloadButtonStyle')) {
downloadButton.classList.add('download-button-alternate');
reloadButton.disabled = true;
reloadButton.classList.add('reload-button-alternate');
} else if (downloadButtonVisible) {
downloadButton.classList.add('download-button');
}
// Show control buttons. // Show control buttons.
if (reloadButtonVisible || showSavedCopyButtonVisible || if (reloadButtonVisible || showSavedCopyButtonVisible ||
downloadButtonVisible) { downloadButtonVisible) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment