[MD settings] Scale avatar icon.

chrome/browser/ui/webui/settings/profile_info_handler.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 "chrome/browser/ui/webui/settings/profile_info_handler.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 20 matching lines @@
 namespace settings {
 
 // static
 const char ProfileInfoHandler::kProfileInfoChangedEventName[] =
     "profile-info-changed";
 const char
     ProfileInfoHandler::kProfileManagesSupervisedUsersChangedEventName[] =
         "profile-manages-supervised-users-changed";
 const char ProfileInfoHandler::kProfileStatsCountReadyEventName[] =
     "profile-stats-count-ready";
+const int kAvatarIconSize = 40;

[tommycli, 2017/03/22 00:00:22]

For this particular variable it may need to be a static member of
ProfileInfoHandler to be accessible in tests. And if not, should be in the
anonymous namespace.

[dschuyler, 2017/03/22 18:16:06]

I've instead moved it near the only place it is used and made it a constexpr.

 
 ProfileInfoHandler::ProfileInfoHandler(Profile* profile)
     : profile_(profile),
 #if defined(OS_CHROMEOS)
       user_manager_observer_(this),
 #endif
       profile_observer_(this),
       callback_weak_ptr_factory_(this) {
 #if defined(OS_CHROMEOS)
   // Set up the chrome://userimage/ source.
@@ skipping 156 matching lines @@
       chromeos::options::UserImageSource::GetUserImage(account_id);
   icon_url = webui::GetPngDataUrl(image->front(), image->size());
 #else   // !defined(OS_CHROMEOS)
   ProfileAttributesEntry* entry;
   if (g_browser_process->profile_manager()
           ->GetProfileAttributesStorage()
           .GetProfileAttributesWithPath(profile_->GetPath(), &entry)) {
     name = base::UTF16ToUTF8(entry->GetName());
 
     if (entry->IsUsingGAIAPicture() && entry->GetGAIAPicture()) {
-      gfx::Image icon =
-          profiles::GetAvatarIconForWebUI(entry->GetAvatarIcon(), true);
+      gfx::Image icon = profiles::GetSizedAvatarIcon(
+          entry->GetAvatarIcon(), true, kAvatarIconSize, kAvatarIconSize);
       icon_url = webui::GetBitmapDataUrl(icon.AsBitmap());
     } else {
       icon_url = profiles::GetDefaultAvatarIconUrl(entry->GetAvatarIconIndex());
     }
   }
 #endif  // defined(OS_CHROMEOS)
 
   base::DictionaryValue* response = new base::DictionaryValue();
   response->SetString("name", name);
   response->SetString("iconUrl", icon_url);
   return base::WrapUnique(response);
 }
 
 bool ProfileInfoHandler::IsProfileManagingSupervisedUsers() const {
   return !profile_->GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
 }
 
 }  // namespace settings