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"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
+#include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 61 matching lines @@
 
 void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon,
                                      bool is_rectangle) {
   icon_.reset(new gfx::Image(icon));
   button_icon_ = gfx::ImageSkia();
   is_rectangle_ = is_rectangle;
   SchedulePaint();
 }
 
 // static
 void AvatarMenuButton::GetAvatarImages(Profile* profile,

[noms (inactive), 2014/10/30 17:39:08]

I wonder if this belongs in profile_avatar_icon_util.cc. Maybe called
GetAvatarImageForBadging or something like that? It's weird because
avatar_button is the *old*, pre-mirror avatar button, which in the future will
basically only used for OTR windows (so it really shouldn't care about badging
the taskbar) 

[Roger Tawa OOO till Jul 10th, 2014/10/31 19:44:39]

The OTR windows *do* care about badging.  OTR windows are supposed to be badged
with the profile's avatar.  Maybe we can leave this function here for now, as
discussed, and then figure out a better place once we remove all support for the
old avatar menu.

                                        gfx::Image* avatar,
                                        gfx::Image* taskbar_badge_avatar,
                                        bool *is_rectangle) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (profile->GetProfileType() == Profile::GUEST_PROFILE) {
     *avatar = rb.
         GetImageNamed(profiles::GetPlaceholderAvatarIconResourceID());
   } else if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE) {
     *avatar = rb.GetImageNamed(IDR_OTR_ICON);
     // TODO(nkostylev): Allow this on ChromeOS once the ChromeOS test
     // environment handles profile directories correctly.
-#if !defined(OS_CHROMEOS)
-    bool is_badge_rectangle = false;
+#if defined(OS_WIN)
     // The taskbar badge should be the profile avatar, not the OTR avatar.
-    AvatarMenu::GetImageForMenuButton(profile,
-                                      taskbar_badge_avatar,
-                                      &is_badge_rectangle);
+    if (switches::IsNewAvatarMenu()) {
+      ProfileShortcutManagerWin::GetBadgingAvatarImages(

[noms (inactive), 2014/10/30 17:39:08]

I don't think this should do different things based on whether the flag is
turned on (the taskbar badge is the same in both cases). I think
AvatarMenu::GetImageForMenuButton should always return the right thing (i.e.
always ignore the high res resource).

(here and below)

[Roger Tawa OOO till Jul 10th, 2014/10/31 19:44:39]

Done.

+          g_browser_process->profile_manager(), profile->GetPath(),
+          taskbar_badge_avatar, NULL);
+    } else {
+      bool is_badge_rectangle = false;
+      AvatarMenu::GetImageForMenuButton(profile,
+                                        taskbar_badge_avatar,
+                                        &is_badge_rectangle);
+    }
 #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);
+#if defined(OS_WIN)
+      ProfileShortcutManagerWin::GetBadgingAvatarImages(
+          g_browser_process->profile_manager(), profile->GetPath(),
+          taskbar_badge_avatar, NULL);
+#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_);
 }