Commit 153eb8a7 authored by rogerta's avatar rogerta Committed by Commit bot

Fix transparent avatar icons.

My previous CL https://codereview.chromium.org/678553002/ did not handle this
case correctly.

BUG=412383

Review URL: https://codereview.chromium.org/686353002

Cr-Commit-Position: refs/heads/master@{#302443}
parent dbd2be26
...@@ -123,6 +123,17 @@ void AvatarMenuButton::GetAvatarImages(Profile* profile, ...@@ -123,6 +123,17 @@ void AvatarMenuButton::GetAvatarImages(Profile* profile,
if (switches::IsNewAvatarMenu()) { if (switches::IsNewAvatarMenu()) {
*avatar = cache.GetAvatarIconOfProfileAtIndex(index); *avatar = cache.GetAvatarIconOfProfileAtIndex(index);
// TODO(noms): Once the code for the old avatar menu button is removed,
// this function will only be called for badging the taskbar icon. The
// function can be renamed to something like GetAvatarImageForBadging()
// and only needs to return the avatar from
// AvatarMenu::GetImageForMenuButton().
#if !defined(OS_CHROMEOS)
bool is_badge_rectangle = false;
AvatarMenu::GetImageForMenuButton(profile,
taskbar_badge_avatar,
&is_badge_rectangle);
#endif
} else { } else {
AvatarMenu::GetImageForMenuButton(profile, avatar, is_rectangle); AvatarMenu::GetImageForMenuButton(profile, avatar, is_rectangle);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment