Supervised users: Use custodian avatar image(s) in the block interstitial if they're available.

chrome/browser/supervised_user/supervised_user_interstitial.cc

 // Copyright 2014 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 "chrome/browser/supervised_user/supervised_user_interstitial.h"
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.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"
 
 using content::BrowserThread;
 
+namespace {
+
+static const int kAvatarSize1x = 45;
+static const int kAvatarSize2x = 90;
+
+std::string BuildAvatarImageUrl(const std::string& url,
+                                const std::string& base_url,

[Bernhard Bauer, 2014/08/18 15:57:31]

Consider passing this as a GURL.

[Marc Treib, 2014/08/18 16:35:34]

Done.

+                                int size) {
+  std::string result = url;
+  size_t slash = result.rfind('/');
+  if (slash != std::string::npos)
+    result.insert(slash, "/s" + base::IntToString(size));
+  result = GURL(base_url).Resolve(result).spec();

[Bernhard Bauer, 2014/08/18 15:57:31]

Inline this into the return?

[Marc Treib, 2014/08/18 16:35:34]

Done.

+  return result;
+}
+
+} // namespace
+
 // static
-void SupervisedUserInterstitial::Show(content::WebContents* web_contents,
-                                   const GURL& url,
-                                   const base::Callback<void(bool)>& callback) {
+void SupervisedUserInterstitial::Show(
+    content::WebContents* web_contents,
+    const GURL& url,
+    const base::Callback<void(bool)>& callback) {
   SupervisedUserInterstitial* interstitial =
       new SupervisedUserInterstitial(web_contents, url, callback);
 
   // If Init() does not complete fully, immediately delete the interstitial.
   if (!interstitial->Init())
     delete interstitial;
   // Otherwise |interstitial_page_| is responsible for deleting it.
 }
 
 SupervisedUserInterstitial::SupervisedUserInterstitial(
@@ skipping 75 matching lines @@
                     l10n_util::GetStringUTF16(IDS_BLOCK_INTERSTITIAL_TITLE));
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   SupervisedUserService* supervised_user_service =
       SupervisedUserServiceFactory::GetForProfile(profile);
 
   bool allow_access_requests = supervised_user_service->AccessRequestsEnabled();
   strings.SetBoolean("allowAccessRequests", allow_access_requests);
 
+  std::string profile_url = profile->GetPrefs()->GetString(
+      prefs::kSupervisedUserCustodianProfileURL);
+  std::string profile_image_url = profile->GetPrefs()->GetString(
+      prefs::kSupervisedUserCustodianProfileImageURL);
+  strings.SetString("avatarURL1x", BuildAvatarImageUrl(profile_image_url,
+                                                       profile_url,
+                                                       kAvatarSize1x));
+  strings.SetString("avatarURL2x", BuildAvatarImageUrl(profile_image_url,
+                                                       profile_url,
+                                                       kAvatarSize2x));
+
+  std::string profile_url2 = profile->GetPrefs()->GetString(
+      prefs::kSupervisedUserSecondCustodianProfileURL);
+  std::string profile_image_url2 = profile->GetPrefs()->GetString(
+      prefs::kSupervisedUserSecondCustodianProfileImageURL);
+  strings.SetString("secondAvatarURL1x", BuildAvatarImageUrl(profile_image_url2,
+                                                             profile_url2,
+                                                             kAvatarSize1x));
+  strings.SetString("secondAvatarURL2x", BuildAvatarImageUrl(profile_image_url2,
+                                                             profile_url2,
+                                                             kAvatarSize2x));
+
   base::string16 custodian =
       base::UTF8ToUTF16(supervised_user_service->GetCustodianName());
   strings.SetString(
       "blockPageMessage",
       allow_access_requests
           ? l10n_util::GetStringFUTF16(IDS_BLOCK_INTERSTITIAL_MESSAGE,
                                        custodian)
           : l10n_util::GetStringUTF16(
                 IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED));
 
@@ skipping 82 matching lines @@
 void SupervisedUserInterstitial::DispatchContinueRequest(
     bool continue_request) {
   // If there is no history entry to go back to, close the tab instead.
   int nav_entry_count = web_contents_->GetController().GetEntryCount();
   if (!continue_request && nav_entry_count == 0)
     web_contents_->Close();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(callback_, continue_request));
 }