[Mac] Redesign the avatar bubble UI

components/signin/core/common/profile_management_switches.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/signin/core/common/profile_management_switches.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "components/signin/core/common/signin_switches.h"
 
@@ skipping 27 matching lines @@
 }
 
 }  // namespace
 
 namespace switches {
 
 bool IsEnableWebBasedSignin() {
   return CheckProfileManagementFlag(switches::kEnableWebBasedSignin, false);
 }
 
-bool IsFastUserSwitching() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kFastUserSwitching);
-}
-
 bool IsGoogleProfileInfo() {
   return CheckProfileManagementFlag(switches::kGoogleProfileInfo, true);
 }
 
 bool IsNewAvatarMenu() {
   bool is_new_avatar_menu =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu);
   return is_new_avatar_menu || IsNewProfileManagement();
 }
 
 bool IsNewProfileManagement() {
   return CheckProfileManagementFlag(switches::kNewProfileManagement, true);
 }
 
 bool IsNewProfileManagementPreviewEnabled() {
   bool is_new_avatar_menu =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu);
   return is_new_avatar_menu && IsNewProfileManagement();
 }
 
+bool IsFastUserSwitching() {
+  bool is_just_new_menu =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewAvatarMenu) &&
+      !IsNewProfileManagement();
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kFastUserSwitching) || is_just_new_menu;
+}
+
 }  // namespace switches