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

Unified Diff: chrome/browser/ui/gtk/browser_titlebar.cc

Issue 8708001: GTK: Custom drawing for GAIA avatar pictures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 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/gtk/avatar_menu_button_gtk.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_titlebar.cc
diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc
index fc31134faf701afc19f41ea13d65d4b10d0d95e4..1d28483032422b219b5ce953915def4c1bc0b863 100644
--- a/chrome/browser/ui/gtk/browser_titlebar.cc
+++ b/chrome/browser/ui/gtk/browser_titlebar.cc
@@ -809,7 +809,11 @@ void BrowserTitlebar::UpdateAvatar() {
Profile* profile = browser_window_->browser()->profile();
size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
if (index != std::string::npos) {
- avatar_button_->SetIcon(cache.GetAvatarIconOfProfileAtIndex(index));
+ bool is_gaia_picture =
+ cache.IsUsingGAIAPictureOfProfileAtIndex(index) &&
+ cache.GetGAIAPictureOfProfileAtIndex(index);
+ avatar_button_->SetIcon(
+ cache.GetAvatarIconOfProfileAtIndex(index), is_gaia_picture);
BubbleGtk::ArrowLocationGtk arrow_location =
display_avatar_on_left_ ^ base::i18n::IsRTL() ?
« no previous file with comments | « chrome/browser/ui/gtk/avatar_menu_button_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698