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

chrome/browser/supervised_user/supervised_user_interstitial.cc

Index: chrome/browser/supervised_user/supervised_user_interstitial.cc
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index 2fa3ca23b2d2b741222f13d287b7343a0cdc0f9c..3b481d9fdf41af83e39bda2e62a804dd19fbcbf0 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -7,6 +7,7 @@
 #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"
@@ -33,10 +34,29 @@
 
 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);
 
@@ -132,6 +152,28 @@ std::string SupervisedUserInterstitial::GetHTMLContents() {
   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(