Updated profile icons to render as circles in the Mac people menu

Added support for circular profile icons in the People system menu
for Mac chromium builds. Updated the reference to the placeholder
icon to use the higher resolution version.

Bug: 857064
Change-Id: I93e68f13ea88827f4ac939d982d4ac55f83cf2f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856876Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707399}

chrome/browser/profiles/avatar_menu_desktop.cc

@@ -44,12 +44,8 @@ AvatarMenu::ImageLoadStatus AvatarMenu::GetImageForMenuButton(
       status = ImageLoadStatus::LOADING;
   }
 
-  // Otherwise, use the default resource, not the downloaded high-res one.
-  const size_t icon_index = entry->GetAvatarIconIndex();
-  const int resource_id =
-      profiles::GetDefaultAvatarIconResourceIDAtIndex(icon_index);
-  *image =
-      ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
+  // Otherwise, use the high resolution icon from local storage.
+  *image = entry->GetAvatarIcon();
 
   return status;
 }

chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm

@@ -163,14 +163,12 @@ class Observer : public BrowserListObserver, public AvatarMenuObserver {
       // Always use the low-res, small default avatars in the menu.
       AvatarMenu::GetImageForMenuButton(itemData.profile_path, &itemIcon);
 
-      // The image might be too large and need to be resized, e.g. if this is
-      // a signed-in user using the GAIA profile photo.
-      if (itemIcon.Width() > kMenuAvatarIconSize ||
-          itemIcon.Height() > kMenuAvatarIconSize) {
-        itemIcon = profiles::GetSizedAvatarIcon(itemIcon, /*is_rectangle=*/true,
-                                                kMenuAvatarIconSize,
-                                                kMenuAvatarIconSize);
-      }
+      // Shapes the avatar icon into a circle for consistency with other avatar
+      // UI elements.
+      itemIcon = profiles::GetSizedAvatarIcon(
+          itemIcon, /*is_rectangle=*/true, kMenuAvatarIconSize,
+          kMenuAvatarIconSize, profiles::SHAPE_CIRCLE);
+
       [item setImage:itemIcon.ToNSImage()];
       [item setState:itemData.active ? NSOnState : NSOffState];
     }