Add profile selector menu to app list.

chrome/browser/profiles/avatar_menu_model.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
@@ skipping 123 matching lines @@
       content::NotificationService::AllSources());
 
   // Build the initial menu.
   RebuildMenu();
 }
 
 AvatarMenuModel::~AvatarMenuModel() {
   ClearMenu();
 }
 
-AvatarMenuModel::Item::Item(size_t model_index, const gfx::Image& icon)
-    : icon(icon),
-      active(false),
-      signed_in(false),
-      signin_required(false),
-      model_index(model_index) {
-}
-
-AvatarMenuModel::Item::~Item() {
-}
-
 void AvatarMenuModel::SwitchToProfile(size_t index, bool always_create) {
   DCHECK(profiles::IsMultipleProfilesEnabled() ||
          index == GetActiveProfileIndex());
-  const Item& item = GetItemAt(index);
+  const ui::AvatarMenuItemModel& item = GetItemAt(index);
   base::FilePath path =
       profile_info_->GetPathOfProfileAtIndex(item.model_index);
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
   profiles::SwitchToProfile(path, desktop_type, always_create);
   ProfileMetrics::LogProfileSwitchUser(ProfileMetrics::SWITCH_PROFILE_ICON);
 }
@@ skipping 17 matching lines @@
   if (!browser) {
     const Browser::CreateParams params(ProfileManager::GetLastUsedProfile(),
                                        chrome::GetActiveDesktop());
     browser = new Browser(params);
   }
   chrome::ShowSettingsSubPage(browser, chrome::kCreateProfileSubPage);
   ProfileMetrics::LogProfileAddNewUser(type);
 }
 
 base::FilePath AvatarMenuModel::GetProfilePath(size_t index) {
-  const Item& item = GetItemAt(index);
+  const ui::AvatarMenuItemModel& item = GetItemAt(index);
   return profile_info_->GetPathOfProfileAtIndex(item.model_index);
 }
 
 // static
 void AvatarMenuModel::SwitchToGuestProfileWindow(Browser* browser) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   profile_manager->CreateProfileAsync(ProfileManager::GetGuestProfilePath(),
                                       base::Bind(&OnGuestProfileCreated,
                                                  false,
                                                  browser->host_desktop_type()),
@@ skipping 18 matching lines @@
   else
     active_profile = browser_->profile();
 
   size_t index =
       profile_info_->GetIndexOfProfileWithPath(active_profile->GetPath());
 
   DCHECK_LT(index, items_.size());
   return index;
 }
 
-const AvatarMenuModel::Item& AvatarMenuModel::GetItemAt(size_t index) {
+const ui::AvatarMenuItemModel& AvatarMenuModel::GetItemAt(size_t index) {
   DCHECK_LT(index, items_.size());
   return *items_[index];
 }
 
 bool AvatarMenuModel::ShouldShowAddNewProfileLink() const {
 #if defined(ENABLE_MANAGED_USERS)
   // |browser_| can be NULL in unit_tests.
   return !browser_ ||
       !ManagedUserService::ProfileIsManaged(browser_->profile());
 #endif
@@ skipping 47 matching lines @@
     return profiles::IsNewProfileManagementEnabled() ||
            (g_browser_process->profile_manager() &&
             g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
   }
   return false;
 }
 
 void AvatarMenuModel::RebuildMenu() {
   ClearMenu();
 
-  const size_t count = profile_info_->GetNumberOfProfiles();
-  for (size_t i = 0; i < count; ++i) {
-    bool is_gaia_picture =
-        profile_info_->IsUsingGAIAPictureOfProfileAtIndex(i) &&
-        profile_info_->GetGAIAPictureOfProfileAtIndex(i);
-
-    gfx::Image icon = profile_info_->GetAvatarIconOfProfileAtIndex(i);
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kNewProfileManagement)) {
-      // old avatar menu uses resized-small images
-      icon = profiles::GetAvatarIconForMenu(icon, is_gaia_picture);
-    }
-
-    Item* item = new Item(i, icon);
-    item->name = profile_info_->GetNameOfProfileAtIndex(i);
-    item->sync_state = profile_info_->GetUserNameOfProfileAtIndex(i);
-    item->signed_in = !item->sync_state.empty();
-    if (!item->signed_in) {
-      item->sync_state = l10n_util::GetStringUTF16(
-          profile_info_->ProfileIsManagedAtIndex(i) ?
-              IDS_MANAGED_USER_AVATAR_LABEL : IDS_PROFILES_LOCAL_PROFILE_STATE);
-    }
-    if (browser_) {
-      base::FilePath path = profile_info_->GetPathOfProfileAtIndex(i);
-      item->active = browser_->profile()->GetPath() == path;
-    }
-    item->signin_required = profile_info_->ProfileIsSigninRequiredAtIndex(i);
-    items_.push_back(item);
-  }
+  profiles::PopulateAvatarMenuItemModels(items_,
+                                         profile_info_,
+                                         browser_->profile()->GetPath());

[tapted, 2013/07/31 05:43:53]

The old code had an `if (browser_)` - is that still needed?

[calamity, 2013/08/01 08:35:45]

Done.

 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteElements(&items_);
 }
 
 
 content::WebContents* AvatarMenuModel::BeginSignOut() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   Profile* current_profile = browser_->profile();
@@ skipping 18 matching lines @@
   contents->GetController().LoadURL(
     logout_url, content::Referrer(),
     content::PAGE_TRANSITION_GENERATED, std::string());
 
   // This object may be destructed when the menu closes but we need something
   // around to finish the sign-out process and close the profile windows.
   new SignoutTracker(current_profile, GURL(landing_url), contents);
 
   return contents;  // returned for testing purposes
 }