Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: components/supervised_user_error_page/supervised_user_error_page.cc

Issue 2695113002: [Webview, Child Accounts] Automatically sign in to Chrome if needed. (Closed)
Patch Set: Fix instrumentation tests Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/supervised_user_error_page/supervised_user_error_page.cc
diff --git a/components/supervised_user_error_page/supervised_user_error_page.cc b/components/supervised_user_error_page/supervised_user_error_page.cc
index 085581bc875d0f8e1ff7e49c61ad86b499fda175..ac28f6f3453c9287cd5240892c97be0832d75166 100644
--- a/components/supervised_user_error_page/supervised_user_error_page.cc
+++ b/components/supervised_user_error_page/supervised_user_error_page.cc
@@ -61,6 +61,8 @@ int GetBlockMessageID(FilteringBehaviorReason reason,
if (single_parent)
return IDS_CHILD_BLOCK_MESSAGE_MANUAL_SINGLE_PARENT;
return IDS_CHILD_BLOCK_MESSAGE_MANUAL_MULTI_PARENT;
+ case NOT_SIGNED_IN:
+ return IDS_SUPERVISED_USER_NOT_SIGNED_IN;
}
NOTREACHED();
return 0;
@@ -96,7 +98,10 @@ std::string BuildHtml(bool allow_access_requests,
base::UTF8ToUTF16(second_custodian_email));
base::string16 block_header;
base::string16 block_message;
- if (allow_access_requests) {
+ if (reason == FilteringBehaviorReason::NOT_SIGNED_IN) {
+ block_header =
+ l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_HEADER_NOT_SIGNED_IN);
+ } else if (allow_access_requests) {
if (is_child_account) {
block_header =
l10n_util::GetStringUTF16(IDS_CHILD_BLOCK_INTERSTITIAL_HEADER);
« no previous file with comments | « components/supervised_user_error_page/supervised_user_error_page.h ('k') | components/supervised_user_error_page_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698