Utility to draw GAIA pictures

chrome/browser/profiles/avatar_menu_model.cc

 // Copyright (c) 2011 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/profiles/avatar_menu_model.h"
 
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/image/image.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class ProfileSwitchObserver : public ProfileManagerObserver {
  public:
   virtual void OnProfileCreated(Profile* profile, Status status) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 109 matching lines @@
 bool AvatarMenuModel::ShouldShowAvatarMenu() {
   return ProfileManager::IsMultipleProfilesEnabled() &&
       g_browser_process->profile_manager()->GetNumberOfProfiles() > 1;
 }
 
 void AvatarMenuModel::RebuildMenu() {
   ClearMenu();
 
   const size_t count = profile_info_->GetNumberOfProfiles();
   for (size_t i = 0; i < count; ++i) {
-    Item* item = new Item(i, profile_info_->GetAvatarIconOfProfileAtIndex(i));
+    bool is_gaia_picture =
+        profile_info_->IsUsingGAIAPictureOfProfileAtIndex(i) &&
+        !profile_info_->GetGAIAPictureOfProfileAtIndex(i).IsNull();
+    gfx::Image icon = profiles::GetAvatarIconForMenu(
+        profile_info_->GetAvatarIconOfProfileAtIndex(i), is_gaia_picture);
+
+    Item* item = new Item(i, icon);
     item->name = profile_info_->GetNameOfProfileAtIndex(i);
     item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
     if (item->sync_state.empty()) {
       item->sync_state = l10n_util::GetStringUTF16(
           IDS_PROFILES_LOCAL_PROFILE_STATE);
     }
     if (browser_) {
       FilePath path = profile_info_->GetPathOfProfileAtIndex(i);
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }