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

components/supervised_user_error_page/supervised_user_error_page.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/supervised_user_error_page/supervised_user_error_page.h"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 19 matching lines @@
 #endif
 
 std::string BuildAvatarImageUrl(const std::string& url, int size) {
   std::string result = url;
   size_t slash = result.rfind('/');
   if (slash != std::string::npos)
     result.insert(slash, "/s" + base::IntToString(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,
                       bool is_child_account,
                       bool single_parent) {
   switch (reason) {
     case DEFAULT:
       if (!is_child_account)
         return IDS_SUPERVISED_USER_BLOCK_MESSAGE_DEFAULT;
       if (single_parent)
@@ skipping 37 matching lines @@
   strings.SetString("secondAvatarURL1x",
                     BuildAvatarImageUrl(profile_image_url2, kAvatarSize1x));
   strings.SetString("secondAvatarURL2x",
                     BuildAvatarImageUrl(profile_image_url2, kAvatarSize2x));
   base::string16 custodian16 = base::UTF8ToUTF16(custodian);
   strings.SetString("custodianName", custodian16);
   strings.SetString("custodianEmail", base::UTF8ToUTF16(custodian_email));
   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);
     }
   } else {
     block_message = l10n_util::GetStringUTF16(
         IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED);
   }
   strings.SetString("blockPageMessage", block_message);
   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);
 #endif
   strings.SetBoolean("showFeedbackLink", show_feedback);
   strings.SetString("feedbackLink", l10n_util::GetStringUTF16(
                                         IDS_BLOCK_INTERSTITIAL_SEND_FEEDBACK));
   strings.SetString("backButton", l10n_util::GetStringUTF16(IDS_BACK_BUTTON));
   strings.SetString(
       "requestAccessButton",
@@ skipping 30 matching lines @@
   std::string html =
       ResourceBundle::GetSharedInstance()
           .GetRawDataResource(IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML)
           .as_string();
   webui::AppendWebUiCssTextDefaults(&html);
   std::string error_html = webui::GetI18nTemplateHtml(html, &strings);
   return error_html;
 }
 
 }  //  namespace supervised_user_error_page