diff options
| author | mlerman <mlerman@chromium.org> | 2014-08-30 07:03:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-30 14:05:24 +0000 |
| commit | 7371f2ce2c82288fe06121fb186cd7a9aa023be0 (patch) | |
| tree | cde7e4dacf55c0d95437e492c39bbc15b6b8a6f6 | |
| parent | 3d213c35d9b69225e79b4079d36e6a1cca3bc475 (diff) | |
| download | chromium_src-7371f2ce2c82288fe06121fb186cd7a9aa023be0.zip chromium_src-7371f2ce2c82288fe06121fb186cd7a9aa023be0.tar.gz chromium_src-7371f2ce2c82288fe06121fb186cd7a9aa023be0.tar.bz2 | |
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}
| -rw-r--r-- | chrome/browser/chromeos/profiles/profile_list_chromeos.cc | 2 | ||||
| -rw-r--r-- | components/signin/core/common/profile_management_switches.cc | 10 |
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() { |