Update supervised user interstitial pages.

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"
 #include "base/values.h"
 #include "components/grit/components_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
 namespace supervised_user_error_page {
 
 namespace {
 
 static const int kAvatarSize1x = 45;
 static const int kAvatarSize2x = 90;
 
-#if defined(GOOGLE_CHROME_BUILD)
 bool ReasonIsAutomatic(FilteringBehaviorReason reason) {
   return reason == ASYNC_CHECKER || reason == BLACKLIST;
 }
-#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;
 }
 
 }  //  namespace
@@ skipping 76 matching lines @@
         IDS_BLOCK_INTERSTITIAL_HEADER_ACCESS_REQUESTS_DISABLED);
     // If access requests are disabled, there is no block message.
   }
   strings.SetString("blockPageHeader", block_header);
   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(
                                              IDS_SUPERVISED_USER_BLOCK_HEADER));
-  bool show_feedback = false;
-#if defined(GOOGLE_CHROME_BUILD)

[Marc Treib, 2017/03/10 10:33:42]

The reason for this was that feedback doesn't work in non-official builds. Has
that changed?

[Bernhard Bauer, 2017/03/10 11:56:42]

I changed it so I can see the feedback link without having to build an
officially branded build. You are right that collecting feedback doesn't
actually work in a plain Chromium build (if nothing else because there is no
entity to collect feedback!), but AFAIK the actual requirements are slightly
different: On Android you need a Clankium build that is signed with a
first-party key (which I have), on desktop feedback is collected via an
extension... I don't know what the requirements for that are.

So I guess really we should ask the feedback mechanism whether it's functional
or not, and then show or hide the link based on that... followup? :)

[Marc Treib, 2017/03/10 12:17:11]

Is it actually an extension? I thought at least some of the code was in Chromium
itself.
Anyway, GOOGLE_CHROME_BUILD should be a superset of the requirements, but I
guess it's not a big deal if the link shows up in other builds. (Those shouldn't
have signed-in child accounts anyway!)
Sure, though I also don't mind too much if we just leave it as it is.

-  show_feedback = is_child_account && ReasonIsAutomatic(reason);
-#endif
+  bool show_feedback = ReasonIsAutomatic(reason);
+  DCHECK(is_child_account || !show_feedback);
+
   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",
       l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_REQUEST_ACCESS_BUTTON));
   strings.SetString(
       "showDetailsLink",
       l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_SHOW_DETAILS));
@@ skipping 26 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