Fix transparent avatar icons.

chrome/browser/ui/views/profiles/avatar_menu_button.cc

 // Copyright 2014 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/views/profiles/avatar_menu_button.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 105 matching lines @@
 #endif
   } else if (AvatarMenu::ShouldShowAvatarMenu()) {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
     if (index == std::string::npos)
       return;
 
     if (switches::IsNewAvatarMenu()) {
       *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 {
       AvatarMenu::GetImageForMenuButton(profile, avatar, is_rectangle);
     }
   }
 }
 
 // views::ViewTargeterDelegate:
 bool AvatarMenuButton::DoesIntersectRect(const views::View* target,
                                          const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   return !disabled_ &&
          views::ViewTargeterDelegate::DoesIntersectRect(target, rect);
 }
 
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (!disabled_)
     chrome::ShowAvatarMenu(browser_);
 }