summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/profiles/profile_list_chromeos.cc2
-rw-r--r--components/signin/core/common/profile_management_switches.cc10
2 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
index b7f0d4a..d8f7591 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos.cc
@@ -54,7 +54,7 @@ void ProfileListChromeOS::RebuildMenu() {
ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));
gfx::Image icon = gfx::Image((*it)->GetImage());
- if (!switches::IsEnableAccountConsistency() && !icon.IsEmpty()) {
+ if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) {
// old avatar menu uses resized-small images
icon = profiles::GetAvatarIconForMenu(icon, true);
}
diff --git a/components/signin/core/common/profile_management_switches.cc b/components/signin/core/common/profile_management_switches.cc
index 7089c8b..e51c77e 100644
--- a/components/signin/core/common/profile_management_switches.cc
+++ b/components/signin/core/common/profile_management_switches.cc
@@ -144,21 +144,11 @@ bool IsGoogleProfileInfo() {
}
bool IsNewAvatarMenu() {
- // NewAvatarMenu is only available on desktop.
-#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS)
- return false;
-#else
return GetProcessState() >= STATE_NEW_AVATAR_MENU;
-#endif
}
bool IsNewProfileManagement() {
- // NewProfileManagement is only available on desktop.
-#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS)
- return false;
-#else
return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT;
-#endif
}
bool IsNewProfileManagementPreviewEnabled() {