| Index: components/signin/core/common/profile_management_switches.cc
|
| diff --git a/components/signin/core/common/profile_management_switches.cc b/components/signin/core/common/profile_management_switches.cc
|
| index 90b1effc44548dd275adf6326c8632c32b5fa76f..84a3a89b75ee7ce81badcf51733ae636cadf6225 100644
|
| --- a/components/signin/core/common/profile_management_switches.cc
|
| +++ b/components/signin/core/common/profile_management_switches.cc
|
| @@ -24,12 +24,6 @@ enum State {
|
| };
|
|
|
| State GetProcessState() {
|
| - // Disables the new avatar menu if the web-based signin is turned on, because
|
| - // the new avatar menu always uses the inline signin, which may break some
|
| - // SAML users.
|
| - if (switches::IsEnableWebBasedSignin())
|
| - return STATE_OLD_AVATAR_MENU;
|
| -
|
| // Find the state of both command line args.
|
| bool is_new_avatar_menu = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableNewAvatarMenu);
|
| @@ -128,12 +122,6 @@ bool IsEnableAccountConsistency() {
|
| return GetProcessState() >= STATE_ACCOUNT_CONSISTENCY;
|
| }
|
|
|
| -bool IsEnableWebBasedSignin() {
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableWebBasedSignin) &&
|
| - !IsEnableWebviewBasedSignin();
|
| -}
|
| -
|
| bool IsEnableWebviewBasedSignin() {
|
| // For now, the webview is enabled only for desktop.
|
| #if defined(OS_CHROMEOS)
|
|
|