Views: Custom drawing for GAIA avatar pictures

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index c35df07aa0c17c5114eb2f4149810085af7ee6b7..1d289f0f8c98dc5fac588af0b46d4bd11ce35b8c 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -39,14 +39,19 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {
     return;
 
   if (browser_view_->IsOffTheRecord()) {
-    avatar_button_->SetIcon(browser_view_->GetOTRAvatarIcon());
+    avatar_button_->SetIcon(
+        gfx::Image(new SkBitmap(browser_view_->GetOTRAvatarIcon())), false);
   } else {
     ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     Profile* profile = browser_view_->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).IsNull();
+      avatar_button_->SetIcon(
+          cache.GetAvatarIconOfProfileAtIndex(index), is_gaia_picture);
       avatar_button_->SetText(cache.GetNameOfProfileAtIndex(index));
     }
   }