Skip to content

GitLab

T
tangled
Commit 679eb85f authored by bauerb's avatar bauerb Committed by Commit bot
Browse files
Options

Update supervised user interstitial pages. 

BUG=698235

Review-Url: https://codereview.chromium.org/2739473006
Cr-Commit-Position: refs/heads/master@{#456074}
parent ce0e6322
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 533 additions and 135 deletions
chrome/browser/supervised_user/supervised_user_interstitial.cc
View file @ 679eb85f
...@@ -267,6 +267,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) { ...@@ -267,6 +267,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
std::string message = l10n_util::GetStringFUTF8( std::string message = l10n_util::GetStringFUTF8(
IDS_BLOCK_INTERSTITIAL_DEFAULT_FEEDBACK_TEXT, reason); IDS_BLOCK_INTERSTITIAL_DEFAULT_FEEDBACK_TEXT, reason);
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
DCHECK(profile_->IsChild());
ReportChildAccountFeedback(web_contents_, message, url_); ReportChildAccountFeedback(web_contents_, message, url_);
#else #else
chrome::ShowFeedbackPage(chrome::FindBrowserWithWebContents(web_contents_), chrome::ShowFeedbackPage(chrome::FindBrowserWithWebContents(web_contents_),
......
chrome/browser/ui/webui/interstitials/interstitial_ui.cc
View file @ 679eb85f
...@@ -15,10 +15,12 @@ ...@@ -15,10 +15,12 @@
#include "chrome/browser/safe_browsing/ui_manager.h" #include "chrome/browser/safe_browsing/ui_manager.h"
#include "chrome/browser/ssl/bad_clock_blocking_page.h" #include "chrome/browser/ssl/bad_clock_blocking_page.h"
#include "chrome/browser/ssl/ssl_blocking_page.h" #include "chrome/browser/ssl/ssl_blocking_page.h"
#include "chrome/browser/supervised_user/supervised_user_interstitial.h"
#include "chrome/common/features.h" #include "chrome/common/features.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
#include "components/grit/components_resources.h" #include "components/grit/components_resources.h"
#include "components/security_interstitials/core/ssl_error_ui.h" #include "components/security_interstitials/core/ssl_error_ui.h"
#include "components/supervised_user_error_page/supervised_user_error_page.h"
#include "content/public/browser/interstitial_page_delegate.h" #include "content/public/browser/interstitial_page_delegate.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
...@@ -65,7 +67,7 @@ scoped_refptr<net::X509Certificate> CreateFakeCert() { ...@@ -65,7 +67,7 @@ scoped_refptr<net::X509Certificate> CreateFakeCert() {
// not used in displaying any real interstitials. // not used in displaying any real interstitials.
class InterstitialHTMLSource : public content::URLDataSource { class InterstitialHTMLSource : public content::URLDataSource {
public: public:
InterstitialHTMLSource() {} explicit InterstitialHTMLSource(Profile* profile) : profile_(profile) {}
~InterstitialHTMLSource() override {} ~InterstitialHTMLSource() override {}
// content::URLDataSource: // content::URLDataSource:
...@@ -80,6 +82,8 @@ class InterstitialHTMLSource : public content::URLDataSource { ...@@ -80,6 +82,8 @@ class InterstitialHTMLSource : public content::URLDataSource {
const content::URLDataSource::GotDataCallback& callback) override; const content::URLDataSource::GotDataCallback& callback) override;
private: private:
Profile* profile_;
DISALLOW_COPY_AND_ASSIGN(InterstitialHTMLSource); DISALLOW_COPY_AND_ASSIGN(InterstitialHTMLSource);
}; };
...@@ -308,7 +312,7 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage( ...@@ -308,7 +312,7 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
InterstitialUI::InterstitialUI(content::WebUI* web_ui) InterstitialUI::InterstitialUI(content::WebUI* web_ui)
: WebUIController(web_ui) { : WebUIController(web_ui) {
Profile* profile = Profile::FromWebUI(web_ui); Profile* profile = Profile::FromWebUI(web_ui);
content::URLDataSource::Add(profile, new InterstitialHTMLSource()); content::URLDataSource::Add(profile, new InterstitialHTMLSource(profile));
} }
InterstitialUI::~InterstitialUI() { InterstitialUI::~InterstitialUI() {
...@@ -365,7 +369,12 @@ void InterstitialHTMLSource::StartDataRequest( ...@@ -365,7 +369,12 @@ void InterstitialHTMLSource::StartDataRequest(
} }
#endif #endif
std::string html; std::string html;
if (interstitial_delegate.get()) { if (base::StartsWith(path, "supervised_user", base::CompareCase::SENSITIVE)) {
html = SupervisedUserInterstitial::GetHTMLContents(
profile_, profile_->IsChild()
? supervised_user_error_page::ASYNC_CHECKER
: supervised_user_error_page::MANUAL);
} else if (interstitial_delegate.get()) {
html = interstitial_delegate.get()->GetHTMLContents(); html = interstitial_delegate.get()->GetHTMLContents();
} else { } else {
html = ResourceBundle::GetSharedInstance() html = ResourceBundle::GetSharedInstance()
......
components/supervised_user_error_page/resources/supervised_user_block_interstitial.html
View file @ 679eb85f
<!doctype html> <!doctype html>
<html i18n-values="dir:textdirection;lang:language"> <html i18n-values="dir:textdirection;lang:language">
<head> <head>
<meta name="viewport" content="width=device-width">
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport"
content="initial-scale=1, minimum-scale=1, width=device-width">
<title i18n-content="blockPageTitle"></title> <title i18n-content="blockPageTitle"></title>
<link rel="stylesheet" href="../../../ui/webui/resources/css/widgets.css">
<link rel="stylesheet" href="supervised_user_block_interstitial.css"> <link rel="stylesheet" href="supervised_user_block_interstitial.css">
<script src="../../../ui/webui/resources/js/cr.js"></script> <script src="../../../ui/webui/resources/js/cr.js"></script>
<script src="../../../ui/webui/resources/js/util.js"></script> <script src="../../../ui/webui/resources/js/util.js"></script>
<script src="supervised_user_block_interstitial.js"></script> <script src="supervised_user_block_interstitial.js"></script>
</head> </head>
<body> <body>
<div id="main-frame-blocked"> <div class="main-frame-blocked">
<div id="information-container"> <div id="information-container">
<h1> <div class="icon" id="icon"></div>
<div id="block-page-header" i18n-content="blockPageHeader"></div> <div id="main-message">
<div id="block-page-message" i18n-content="blockPageMessage"></div> <h1 id="block-page-header" i18n-content="blockPageHeader"></h1>
<div id="request-failed-message" i18n-content="requestFailedMessage" <p id="block-page-message" i18n-content="blockPageMessage"></p>
hidden></div> <h1 id="request-failed-message" i18n-content="requestFailedMessage"
<div id="request-sent-message" i18n-content="requestSentMessage" hidden> hidden></h1>
</div> <h1 id="request-sent-message" i18n-content="requestSentMessage" hidden></h1>
</h1> </div>
<div id="custodians-information" hidden> <div id="custodians-information" hidden>
<div id="custodian-information" class="custodian-information"> <div id="custodian-information" class="custodian-information">
<img id="custodian-avatar-img" class="avatar-img"> <img id="custodian-avatar-img" class="avatar-img">
...@@ -39,19 +38,14 @@ ...@@ -39,19 +38,14 @@
</div> </div>
</div> </div>
</div> </div>
<div id="button-container"> <div class="button-container">
<button id="request-access-button" class="primary-button" i18n-content="requestAccessButton">
</button>
<div id="details-button-container"> <div id="details-button-container">
<a id="show-details-link" i18n-content="showDetailsLink" <button id="show-details-link" class="details-button small-link" i18n-content="showDetailsLink" hidden></button>
hidden class="button"> <button id="hide-details-link" class="details-button small-link" i18n-content="hideDetailsLink" hidden></button>
</a> <button id="back-button" class="details-button small-link" i18n-content="backButton" hidden></button>
<a id="hide-details-link" i18n-content="hideDetailsLink"
hidden class="button"></a>
<a id="back-button" i18n-content="backButton"
hidden class="button"></a>
</div> </div>
<div id="request-access-button" class="button"
i18n-content="requestAccessButton">
</div>
</div> </div>
<div id="details" hidden> <div id="details" hidden>
<p id="details-header" i18n-content="blockReasonHeader"></p> <p id="details-header" i18n-content="blockReasonHeader"></p>
......
components/supervised_user_error_page/resources/supervised_user_block_interstitial.js
View file @ 679eb85f
...@@ -2,6 +2,40 @@ ...@@ -2,6 +2,40 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
var mobileNav = false;
var showDetails = false;
/**
* For small screen mobile the navigation buttons are moved
* below the advanced text.
*/
function onResize() {
var mediaQuery = '(min-width: 240px) and (max-width: 420px) and ' +
'(max-height: 736px) and (min-height: 401px) and ' +
'(orientation: portrait), (max-width: 736px) and ' +
'(max-height: 420px) and (min-height: 240px) and ' +
'(min-width: 421px) and (orientation: landscape)';
// Check for change in nav status.
if (mobileNav != window.matchMedia(mediaQuery).matches) {
mobileNav = !mobileNav;
updateDetails();
}
}
function updateDetails() {
$('information-container').hidden = mobileNav && showDetails;
$('details').hidden = !showDetails;
}
function setupMobileNav() {
window.addEventListener('resize', onResize);
onResize();
}
document.addEventListener('DOMContentLoaded', setupMobileNav);
function sendCommand(cmd) { function sendCommand(cmd) {
window.domAutomationController.setAutomationId(1); window.domAutomationController.setAutomationId(1);
window.domAutomationController.send(cmd); window.domAutomationController.send(cmd);
...@@ -57,18 +91,16 @@ function initialize() { ...@@ -57,18 +91,16 @@ function initialize() {
sendCommand('back'); sendCommand('back');
}; };
$('show-details-link').onclick = function(event) { $('show-details-link').onclick = function(event) {
$('details').hidden = false; showDetails = true;
$('show-details-link').hidden = true; $('show-details-link').hidden = true;
$('hide-details-link').hidden = false; $('hide-details-link').hidden = false;
$('information-container').classList.add('hidden-on-mobile'); updateDetails();
$('request-access-button').classList.add('hidden-on-mobile');
}; };
$('hide-details-link').onclick = function(event) { $('hide-details-link').onclick = function(event) {
$('details').hidden = true; showDetails = false;
$('show-details-link').hidden = false; $('show-details-link').hidden = false;
$('hide-details-link').hidden = true; $('hide-details-link').hidden = true;
$('information-container').classList.remove('hidden-on-mobile'); updateDetails();
$('request-access-button').classList.remove('hidden-on-mobile');
}; };
if (window.domAutomationController && if (window.domAutomationController &&
loadTimeData.getBoolean('showFeedbackLink')) { loadTimeData.getBoolean('showFeedbackLink')) {
...@@ -88,17 +120,20 @@ function setRequestStatus(isSuccessful) { ...@@ -88,17 +120,20 @@ function setRequestStatus(isSuccessful) {
console.log('setRequestStatus(' + isSuccessful +')'); console.log('setRequestStatus(' + isSuccessful +')');
$('block-page-header').hidden = true; $('block-page-header').hidden = true;
$('block-page-message').hidden = true; $('block-page-message').hidden = true;
$('hide-details-link').hidden = true;
showDetails = false;
updateDetails();
if (isSuccessful) { if (isSuccessful) {
$('request-failed-message').hidden = true; $('request-failed-message').hidden = true;
$('request-sent-message').hidden = false; $('request-sent-message').hidden = false;
$('show-details-link').hidden = true;
$('hide-details-link').hidden = true;
$('details').hidden = true;
$('back-button').hidden = !window.domAutomationController; $('back-button').hidden = !window.domAutomationController;
$('request-access-button').hidden = true; $('request-access-button').hidden = true;
$('show-details-link').hidden = true;
} else { } else {
$('request-failed-message').hidden = false; $('request-failed-message').hidden = false;
$('request-access-button').hidden = false; $('request-access-button').hidden = false;
$('show-details-link').hidden = false;
} }
} }
......
components/supervised_user_error_page/supervised_user_error_page.cc
View file @ 679eb85f
...@@ -23,11 +23,9 @@ namespace { ...@@ -23,11 +23,9 @@ namespace {
static const int kAvatarSize1x = 45; static const int kAvatarSize1x = 45;
static const int kAvatarSize2x = 90; static const int kAvatarSize2x = 90;
#if defined(GOOGLE_CHROME_BUILD)
bool ReasonIsAutomatic(FilteringBehaviorReason reason) { bool ReasonIsAutomatic(FilteringBehaviorReason reason) {
return reason == ASYNC_CHECKER || reason == BLACKLIST; return reason == ASYNC_CHECKER || reason == BLACKLIST;
} }
#endif
std::string BuildAvatarImageUrl(const std::string& url, int size) { std::string BuildAvatarImageUrl(const std::string& url, int size) {
std::string result = url; std::string result = url;
...@@ -124,10 +122,9 @@ std::string BuildHtml(bool allow_access_requests, ...@@ -124,10 +122,9 @@ std::string BuildHtml(bool allow_access_requests,
reason, is_child_account, second_custodian.empty()))); reason, is_child_account, second_custodian.empty())));
strings.SetString("blockReasonHeader", l10n_util::GetStringUTF16( strings.SetString("blockReasonHeader", l10n_util::GetStringUTF16(
IDS_SUPERVISED_USER_BLOCK_HEADER)); IDS_SUPERVISED_USER_BLOCK_HEADER));
bool show_feedback = false; bool show_feedback = ReasonIsAutomatic(reason);
#if defined(GOOGLE_CHROME_BUILD) DCHECK(is_child_account || !show_feedback);
show_feedback = is_child_account && ReasonIsAutomatic(reason);
#endif
strings.SetBoolean("showFeedbackLink", show_feedback); strings.SetBoolean("showFeedbackLink", show_feedback);
strings.SetString("feedbackLink", l10n_util::GetStringUTF16( strings.SetString("feedbackLink", l10n_util::GetStringUTF16(
IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK)); IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK));
......
components/supervised_user_error_page/supervised_user_error_page_unittest.cc
View file @ 679eb85f
...@@ -40,8 +40,7 @@ BlockMessageIDTestParameter block_message_id_test_params[] = { ...@@ -40,8 +40,7 @@ BlockMessageIDTestParameter block_message_id_test_params[] = {
{DEFAULT, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT}, {DEFAULT, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT},
{DEFAULT, true, true, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_SINGLE_PARENT}, {DEFAULT, true, true, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_SINGLE_PARENT},
{DEFAULT, true, false, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_MULTI_PARENT}, {DEFAULT, true, false, IDS_CHILD_BLOCK_MESSAGE_DEFAULT_MULTI_PARENT},
{ASYNC_CHECKER, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES}, // SafeSites is not enabled for supervised users.
{ASYNC_CHECKER, false, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
{ASYNC_CHECKER, true, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES}, {ASYNC_CHECKER, true, true, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
{ASYNC_CHECKER, true, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES}, {ASYNC_CHECKER, true, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_SAFE_SITES},
{MANUAL, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_MANUAL}, {MANUAL, false, false, IDS_SUPERVISED_USER_BLOCK_MESSAGE_MANUAL},
...@@ -93,13 +92,12 @@ TEST_P(SupervisedUserErrorPageTest_BuildHtml, BuildHtml) { ...@@ -93,13 +92,12 @@ TEST_P(SupervisedUserErrorPageTest_BuildHtml, BuildHtml) {
EXPECT_THAT(result, testing::HasSubstr(param.second_custodian)); EXPECT_THAT(result, testing::HasSubstr(param.second_custodian));
EXPECT_THAT(result, testing::HasSubstr(param.second_custodian_email)); EXPECT_THAT(result, testing::HasSubstr(param.second_custodian_email));
} }
#if defined(GOOGLE_CHROME_BUILD) if (param.reason == ASYNC_CHECKER || param.reason == BLACKLIST) {
if (param.is_child_account &&
(param.reason == ASYNC_CHECKER || param.reason == BLACKLIST))
EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":true")); EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":true"));
else } else {
#endif
EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":false")); EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":false"));
}
// Messages containing parameters aren't tested since they get modified before // Messages containing parameters aren't tested since they get modified before
// they are added to the result. // they are added to the result.
if (param.allow_access_requests) { if (param.allow_access_requests) {
...@@ -201,7 +199,7 @@ BuildHtmlTestParameter build_html_test_parameter[] = { ...@@ -201,7 +199,7 @@ BuildHtmlTestParameter build_html_test_parameter[] = {
{true, "url1", "url2", "custodian", "custodian_email", "custodian2", {true, "url1", "url2", "custodian", "custodian_email", "custodian2",
"custodian2_email", false, DEFAULT, true}, "custodian2_email", false, DEFAULT, true},
{true, "url1", "url2", "custodian", "custodian_email", "custodian2", {true, "url1", "url2", "custodian", "custodian_email", "custodian2",
"custodian2_email", false, ASYNC_CHECKER, true}, "custodian2_email", true, ASYNC_CHECKER, true},
}; };
INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized, INSTANTIATE_TEST_CASE_P(GetBlockMessageIDParameterized,
......
components/supervised_user_error_page_strings.grdp
View file @ 679eb85f
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
We could not reach your parents at the moment. Please try again. We could not reach your parents at the moment. Please try again.
</message> </message>
<message name="IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK" desc="The text for a link to submit feedback about a blocked site."> <message name="IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK" desc="The text for a link to submit feedback about a blocked site.">
Was this unexpected? <ph name="BEGIN_LINK">&lt;a is="action-link" id="feedback-link"&gt;</ph>Let us know<ph name="END_LINK">&lt;/a&gt;</ph> Was this unexpected? <ph name="BEGIN_LINK">&lt;a href="#" id="feedback-link"&gt;</ph>Let us know<ph name="END_LINK">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_BLOCK_INTERSTITIAL_SHOW_DETAILS" desc="The text for the link to show details about the interstitial."> <message name="IDS_BLOCK_INTERSTITIAL_SHOW_DETAILS" desc="The text for the link to show details about the interstitial.">
Details Details
......
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