Supervised User interstitial: Update strings to be more child-friendly

components/supervised_user_error_page/supervised_user_error_page.cc

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 449c24ceca446191d88d11a1beb0e2c1092accbe..a86718f2ee54c42e881843c81db72ec3202572ea 100644
--- a/components/supervised_user_error_page/supervised_user_error_page.cc
+++ b/components/supervised_user_error_page/supervised_user_error_page.cc
@@ -37,22 +37,6 @@ std::string BuildAvatarImageUrl(const std::string& url, int size) {
   return result;
 }
 
-int GetBlockHeaderID(FilteringBehaviorReason reason) {
-  switch (reason) {
-    case DEFAULT:
-      return IDS_SUPERVISED_USER_BLOCK_HEADER_DEFAULT;
-    case BLACKLIST:
-    case ASYNC_CHECKER:
-      return IDS_SUPERVISED_USER_BLOCK_HEADER_SAFE_SITES;
-    case WHITELIST:
-      NOTREACHED();
-      break;
-    case MANUAL:
-      return IDS_SUPERVISED_USER_BLOCK_HEADER_MANUAL;
-  }
-  NOTREACHED();
-  return 0;
-}
 }  //  namespace
 
 int GetBlockMessageID(FilteringBehaviorReason reason,
@@ -110,13 +94,16 @@ std::string BuildHtml(bool allow_access_requests,
   strings.SetString("secondCustodianName", base::UTF8ToUTF16(second_custodian));
   strings.SetString("secondCustodianEmail",
                     base::UTF8ToUTF16(second_custodian_email));
+  if (is_child_account) {

[Marc Treib, 2016/11/08 16:33:44]

SUs don't get the header, which will effectively hide the corresponding element.

+    strings.SetString(
+        "blockPageHeader",
+        l10n_util::GetStringUTF16(IDS_CHILD_BLOCK_INTERSTITIAL_HEADER));
+  }
   base::string16 block_message;
   if (allow_access_requests) {
     if (is_child_account) {
-      block_message = l10n_util::GetStringUTF16(
-          second_custodian.empty()
-              ? IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT
-              : IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT);
+      block_message =
+          l10n_util::GetStringUTF16(IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE);

[Pam (message me for reviews), 2016/11/08 17:15:11]

Hmm, two-parent management will be coming eventually.

[Marc Treib, 2016/11/08 17:30:29]

But the message doesn't reference the parent(s) anymore :)
(It's "Looks like you need permission to visit this site")

     } else {
       block_message = l10n_util::GetStringFUTF16(IDS_BLOCK_INTERSTITIAL_MESSAGE,
                                                  custodian16);
@@ -129,8 +116,8 @@ std::string BuildHtml(bool allow_access_requests,
   strings.SetString("blockReasonMessage",
                     l10n_util::GetStringUTF16(GetBlockMessageID(
                         reason, is_child_account, second_custodian.empty())));
-  strings.SetString("blockReasonHeader",
-                    l10n_util::GetStringUTF16(GetBlockHeaderID(reason)));
+  strings.SetString("blockReasonHeader", l10n_util::GetStringUTF16(
+                                             IDS_SUPERVISED_USER_BLOCK_HEADER));
   bool show_feedback = false;
 #if defined(GOOGLE_CHROME_BUILD)
   show_feedback = is_child_account && ReasonIsAutomatic(reason);