Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3116)

Unified Diff: chrome/browser/ui/views/profiles/avatar_menu_button.cc

Issue 660813002: [Win] Add a fast profile switcher to the Windows taskbar item. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: commas. commas are important Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 65d8452a84464aef9d1cbe52f3460661dee7c963..9ee925000458e64ca71ad28341122495bcfe6a6c 100644
--- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc
+++ b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
@@ -110,9 +110,8 @@ void AvatarMenuButton::GetAvatarImages(Profile* profile,
#if !defined(OS_CHROMEOS)
bool is_badge_rectangle = false;
// The taskbar badge should be the profile avatar, not the OTR avatar.
- AvatarMenu::GetImageForMenuButton(profile,
- taskbar_badge_avatar,
- &is_badge_rectangle);
+ profiles::GetTransparentBackgroundProfileAvatar(
+ profile->GetPath(), taskbar_badge_avatar, &is_badge_rectangle);
#endif
} else if (AvatarMenu::ShouldShowAvatarMenu()) {
ProfileInfoCache& cache =
@@ -127,15 +126,15 @@ void AvatarMenuButton::GetAvatarImages(Profile* profile,
// 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().
+ // profiles::GetTransparentBackgroundProfileAvatar.
#if !defined(OS_CHROMEOS)
bool is_badge_rectangle = false;
- AvatarMenu::GetImageForMenuButton(profile,
- taskbar_badge_avatar,
- &is_badge_rectangle);
+ profiles::GetTransparentBackgroundProfileAvatar(
+ profile->GetPath(), taskbar_badge_avatar, &is_badge_rectangle);
#endif
} else {
- AvatarMenu::GetImageForMenuButton(profile, avatar, is_rectangle);
+ profiles::GetTransparentBackgroundProfileAvatar(
+ profile->GetPath(), avatar, is_rectangle);
}
}
}
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698