Change new-avatar-menu to an enable-disable flag.

components/signin/core/common/signin_switches.cc

Index: components/signin/core/common/signin_switches.cc
diff --git a/components/signin/core/common/signin_switches.cc b/components/signin/core/common/signin_switches.cc
index f8be40cf98fd05c02421c52564d19048956203b3..c4935a5c522055dbf967d2a1a7bb3d8e27c15a97 100644
--- a/components/signin/core/common/signin_switches.cc
+++ b/components/signin/core/common/signin_switches.cc
@@ -16,12 +16,18 @@ const char kDisableAccountConsistency[] = "disable-account-consistency";
 // Disables new profile management system, including new profile chooser UI.
 const char kDisableNewProfileManagement[] = "disable-new-profile-management";
 
+// Disables the new avatar menu, forcing the top-corner avatar button.
+const char kDisableNewAvatarMenu[] = "disable-new-avatar-menu";
+
 // Enables consistent identity features.
 const char kEnableAccountConsistency[] = "enable-account-consistency";
 
-// Enables new profile management system, including new profile chooser UI.
+// Enables new profile management system, including lock mode.
 const char kEnableNewProfileManagement[] = "new-profile-management";
 
+// Enable the new profile chooser UI and User Manager.

[msw, 2014/08/01 16:45:15]

nit: Consider "new avatar menu" for consistency with kDisable, and use 'the'
before "User Manager."

[Mike Lerman, 2014/08/01 19:15:00]

Done.

+const char kEnableNewAvatarMenu[] = "enable-new-avatar-menu";
+
 // Enable sending signin scopde device id to LSO with refresh token request.
 const char kEnableSigninScopedDeviceId[] = "enable-signin-scoped-device-id";
 
@@ -39,10 +45,4 @@ const char kFastUserSwitching[] = "fast-user-switching";
 // Enables using GAIA information to populate profile name and icon.
 const char kGoogleProfileInfo[] = "google-profile-info";
 
-// Use new avatar menu. When combined with new-profile-management, it simply
-// shows the new profile management avatar menu. Otherwise it shows a redesigned
-// avatar menu with the same functionality as the old one, plus a tutorial card
-// at the top prompting the user to try out the new profile management UI.
-const char kNewAvatarMenu[] = "new-avatar-menu";
-
 }  // namespace switches