Chromium Code Reviews| Index: chrome/browser/ui/views/profiles/avatar_menu_button.cc |
| diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.cc b/chrome/browser/ui/views/profiles/avatar_menu_button.cc |
| index 1c0aa1828d731b9a7e8827a990adb61c876a7e65..c80aff88a9233fc7a60719fa3ffc0e5a67604a18 100644 |
| --- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc |
| +++ b/chrome/browser/ui/views/profiles/avatar_menu_button.cc |
| @@ -121,24 +121,22 @@ bool AvatarMenuButton::GetAvatarImages(Profile* profile, |
| if (index == std::string::npos) |
| return false; |
| - if (switches::IsNewAvatarMenu()) { |
| +#if !defined(OS_CHROMEOS) |
|
Peter Kasting
2015/09/25 23:42:52
Nit: Remove "!" and reverse arms
anthonyvd
2015/09/29 20:23:16
Done.
|
| *avatar = cache.GetAvatarIconOfProfileAtIndex(index); |
|
Peter Kasting
2015/09/25 23:42:52
Nit: Unindent
anthonyvd
2015/09/29 20:23:16
Done.
|
| // 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->GetPath(), |
| taskbar_badge_avatar, |
| &is_badge_rectangle); |
| -#endif |
| - } else { |
| +#else |
| AvatarMenu::GetImageForMenuButton(profile->GetPath(), |
| avatar, |
| is_rectangle); |
| - } |
| +#endif |
| } |
| return true; |
| } |