diff options
| author | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 00:49:23 +0000 |
|---|---|---|
| committer | noms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-05 00:49:23 +0000 |
| commit | c8fe83871e647dec96307d40e5fcb796efd4f213 (patch) | |
| tree | edd219f25e55736f08dfed9efb602b0ebb2d5dba /components/signin | |
| parent | 6653f5ba07272ac17be5b5f659bc4e202d1bac7d (diff) | |
| download | chromium_src-c8fe83871e647dec96307d40e5fcb796efd4f213.zip chromium_src-c8fe83871e647dec96307d40e5fcb796efd4f213.tar.gz chromium_src-c8fe83871e647dec96307d40e5fcb796efd4f213.tar.bz2 | |
Bring back Gaia avatars if --new-avatar-menu is turned on.
This should work whether or not --google-profile-info is turned on.
BUG=399678
TEST=Flip --new-avatar-menu (but not --google-profile-info). You should
be able to choose your Gaia avatar from the manageProfile dialog.
Review URL: https://codereview.chromium.org/417043008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/signin')
| -rw-r--r-- | components/signin/core/common/profile_management_switches.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/signin/core/common/profile_management_switches.cc b/components/signin/core/common/profile_management_switches.cc index c1afca4..d24145c 100644 --- a/components/signin/core/common/profile_management_switches.cc +++ b/components/signin/core/common/profile_management_switches.cc @@ -122,8 +122,8 @@ bool IsFastUserSwitching() { } bool IsGoogleProfileInfo() { - return CheckFlag(switches::kGoogleProfileInfo, - STATE_NEW_PROFILE_MANAGEMENT); + return IsNewAvatarMenu() || + CheckFlag(switches::kGoogleProfileInfo, STATE_NONE); } bool IsNewAvatarMenu() { |