Commit 7371f2ce authored by mlerman's avatar mlerman Committed by Commit bot

Revert of Disable UI flags for non-desktop OSes (patchset #4 id:60001 of...

Revert of Disable UI flags for non-desktop OSes (patchset #4 id:60001 of https://codereview.chromium.org/480453002/)

Reason for revert:
This will cause android to lose account consistency. I should not have removed the file!

Original issue's description:
> Disable UI flags for non-desktop OSes
>
> This is mostly to prevent the high res avatars from being downloaded when not necessary, and will also prevent any other non-UI side effects which are undesired on non-desktop OSes.
>
> BUG=404066
>
> Committed: https://chromium.googlesource.com/chromium/src/+/8003a95bb88e1d25ad59251b5d7e8609d76e5669

TBR=noms@chromium.org,rogerta@chromium.org,newt@chromium.org,dzhioev@chromium.org,aruslan@chromium.org,xiyuan@chromium.org,nkostylev@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=404066

Review URL: https://codereview.chromium.org/524023002

Cr-Commit-Position: refs/heads/master@{#292789}
parent 3d213c35
...@@ -54,7 +54,7 @@ void ProfileListChromeOS::RebuildMenu() { ...@@ -54,7 +54,7 @@ void ProfileListChromeOS::RebuildMenu() {
ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash())); ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));
gfx::Image icon = gfx::Image((*it)->GetImage()); gfx::Image icon = gfx::Image((*it)->GetImage());
if (!switches::IsEnableAccountConsistency() && !icon.IsEmpty()) { if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) {
// old avatar menu uses resized-small images // old avatar menu uses resized-small images
icon = profiles::GetAvatarIconForMenu(icon, true); icon = profiles::GetAvatarIconForMenu(icon, true);
} }
......
...@@ -144,21 +144,11 @@ bool IsGoogleProfileInfo() { ...@@ -144,21 +144,11 @@ bool IsGoogleProfileInfo() {
} }
bool IsNewAvatarMenu() { 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; return GetProcessState() >= STATE_NEW_AVATAR_MENU;
#endif
} }
bool IsNewProfileManagement() { 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; return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT;
#endif
} }
bool IsNewProfileManagementPreviewEnabled() { bool IsNewProfileManagementPreviewEnabled() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment