Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git] / src / chrome / browser / profiles / profile_list_desktop.cc
index 73fa8ee..59ffb78 100644 (file)
@@ -5,9 +5,9 @@
 #include "chrome/browser/profiles/profile_list_desktop.h"
 
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_info_util.h"
-#include "chrome/common/profile_management_switches.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -43,16 +43,8 @@ void ProfileListDesktop::RebuildMenu() {
       omitted_item_count_++;
       continue;
     }
-    bool is_gaia_picture =
-        profile_info_->IsUsingGAIAPictureOfProfileAtIndex(i) &&
-        profile_info_->GetGAIAPictureOfProfileAtIndex(i);
 
     gfx::Image icon = profile_info_->GetAvatarIconOfProfileAtIndex(i);
-    if (!switches::IsNewProfileManagement()) {
-      // The old avatar menu uses resized-small images.
-      icon = profiles::GetAvatarIconForMenu(icon, is_gaia_picture);
-    }
-
     AvatarMenu::Item* item = new AvatarMenu::Item(i - omitted_item_count_,
                                                   i,
                                                   icon);