Fixed suggesting adding more users into multi-profile session when we don't have more

ash/system/user/user_view.cc

Index: ash/system/user/user_view.cc
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
index 52f128da1a52fd41b6430984cfed08dbb0682306..1ee3a51bee0a5f3475564cea03c1b1629201f92b 100644
--- a/ash/system/user/user_view.cc
+++ b/ash/system/user/user_view.cc
@@ -499,9 +499,12 @@ void UserView::ToggleAddUserMenuOption() {
 
   bool multi_profile_allowed =
       delegate->IsMultiProfileAllowedByPrimaryUserPolicy();
-  add_user_disabled_ = (delegate->NumberOfLoggedInUsers() >=
-                        delegate->GetMaximumNumberOfLoggedInUsers()) ||
-                       !multi_profile_allowed;
+  int admitted_users_to_be_added =
+      delegate->GetNumberOfAdmittedForMultiProfileUsers();
+  add_user_disabled_ = !multi_profile_allowed ||
+                       admitted_users_to_be_added <= 0 ||

[dzhioev (left Google), 2014/09/18 07:14:22]

Checking for "<= 0" doesn't make sense to me. Can we just check that it is not
0?

[Roman Sorokin (ftl), 2014/09/22 08:36:06]

Done.

+                       (delegate->NumberOfLoggedInUsers() >=
+                        delegate->GetMaximumNumberOfLoggedInUsers());
 
   ButtonFromView* button = new ButtonFromView(
       add_user_view,
@@ -519,6 +522,8 @@ void UserView::ToggleAddUserMenuOption() {
     int message_id;
     if (!multi_profile_allowed)
       message_id = IDS_ASH_STATUS_TRAY_MESSAGE_NOT_ALLOWED_PRIMARY_USER;
+    else if (admitted_users_to_be_added <= 0)
+      message_id = IDS_ASH_STATUS_TRAY_MESSAGE_OUT_OF_USERS;
     else
       message_id = IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER;