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

ash/system/user/user_view.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 "ash/system/user/user_view.h"
 
 #include <algorithm>
 
 #include "ash/multi_profile_uma.h"
 #include "ash/popup_message.h"
@@ skipping 189 matching lines @@
 
 UserView::UserView(SystemTrayItem* owner,
                    user::LoginStatus login,
                    MultiProfileIndex index,
                    bool for_detailed_view)
     : multiprofile_index_(index),
       user_card_view_(NULL),
       owner_(owner),
       is_user_card_button_(false),
       logout_button_(NULL),
-      add_user_disabled_(false),
+      add_user_enabled_(true),
       for_detailed_view_(for_detailed_view),
       focus_manager_(NULL) {
   CHECK_NE(user::LOGGED_IN_NONE, login);
   if (!index) {
     // Only the logged in user will have a background. All other users will have
     // to allow the TrayPopupContainer highlighting the menu line.
     set_background(views::Background::CreateSolidBackground(
         login == user::LOGGED_IN_PUBLIC ? kPublicAccountBackgroundColor
                                         : kBackgroundColor));
   }
@@ skipping 10 matching lines @@
 UserView::~UserView() {
   RemoveAddUserMenuOption();
 }
 
 void UserView::MouseMovedOutOfHost() {
   RemoveAddUserMenuOption();
 }
 
 TrayUser::TestState UserView::GetStateForTest() const {
   if (add_menu_option_.get()) {
-    return add_user_disabled_ ? TrayUser::ACTIVE_BUT_DISABLED
-                              : TrayUser::ACTIVE;
+    return add_user_enabled_ ? TrayUser::ACTIVE : TrayUser::ACTIVE_BUT_DISABLED;
   }
 
   if (!is_user_card_button_)
     return TrayUser::SHOWN;
 
   return static_cast<ButtonFromView*>(user_card_view_)->is_hovered_for_test()
              ? TrayUser::HOVERED
              : TrayUser::SHOWN;
 }
 
@@ skipping 237 matching lines @@
   // Show the content.
   add_menu_option_->SetAlwaysOnTop(true);
   add_menu_option_->Show();
 
   AddUserView* add_user_view =
       new AddUserView(static_cast<ButtonFromView*>(user_card_view_));
 
   const SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
 
-  bool multi_profile_allowed =
-      delegate->IsMultiProfileAllowedByPrimaryUserPolicy();
-  add_user_disabled_ = (delegate->NumberOfLoggedInUsers() >=
-                        delegate->GetMaximumNumberOfLoggedInUsers()) ||
-                       !multi_profile_allowed;
+  SessionStateDelegate::MultiProfileAddUserError add_user_error;
+  add_user_enabled_ = delegate->CanAddUserToMultiProfile(&add_user_error);
 
-  ButtonFromView* button = new ButtonFromView(
-      add_user_view,
-      add_user_disabled_ ? NULL : this,
-      !add_user_disabled_,
-      gfx::Insets(1, 1, 1, 1));
+  ButtonFromView* button = new ButtonFromView(add_user_view,
+                                              add_user_enabled_ ? this : NULL,
+                                              add_user_enabled_,
+                                              gfx::Insets(1, 1, 1, 1));
   button->set_request_focus_on_press(false);
   button->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
   button->ForceBorderVisible(true);
   add_menu_option_->SetContentsView(button);
 
-  if (add_user_disabled_) {
+  if (add_user_enabled_) {
+    // We activate the entry automatically if invoked with focus.
+    if (user_card_view_->HasFocus()) {
+      button->GetFocusManager()->SetFocusedView(button);
+      user_card_view_->GetFocusManager()->SetFocusedView(button);
+    }
+  } else {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     int message_id;
-    if (!multi_profile_allowed)
-      message_id = IDS_ASH_STATUS_TRAY_MESSAGE_NOT_ALLOWED_PRIMARY_USER;
-    else
-      message_id = IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER;
+    switch (add_user_error) {
+      case SessionStateDelegate::
+          MULTIPROFILE_ADD_USER_ERROR_NOT_ALLOWED_PRIMARY_USER:
+        message_id = IDS_ASH_STATUS_TRAY_MESSAGE_NOT_ALLOWED_PRIMARY_USER;
+        break;
+      case SessionStateDelegate::
+          MULTIPROFILE_ADD_USER_ERROR_MAXIMUM_OF_USERS_REACHED:
+        message_id = IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER;
+        break;
+      case SessionStateDelegate::MULTIPROFILE_ADD_USER_ERROR_OUT_OF_USERS:
+        message_id = IDS_ASH_STATUS_TRAY_MESSAGE_OUT_OF_USERS;
+        break;
+      default:
+        NOTREACHED() << "Unknown adding user error " << add_user_error;
+    }
 
     popup_message_.reset(new PopupMessage(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER),
         bundle.GetLocalizedString(message_id),
         PopupMessage::ICON_WARNING,
         add_user_view->anchor(),
         views::BubbleBorder::TOP_LEFT,
         gfx::Size(parent()->bounds().width() - kPopupMessageOffset, 0),
         2 * kPopupMessageOffset));
-  } else {
-    // We activate the entry automatically if invoked with focus.
-    if (user_card_view_->HasFocus()) {
-      button->GetFocusManager()->SetFocusedView(button);
-      user_card_view_->GetFocusManager()->SetFocusedView(button);
-    }
   }
   // Find the screen area which encloses both elements and sets then a mouse
   // watcher which will close the "menu".
   gfx::Rect area = user_card_view_->GetBoundsInScreen();
   area.set_height(2 * area.height());
   mouse_watcher_.reset(
       new views::MouseWatcher(new UserViewMouseWatcherHost(area), this));
   mouse_watcher_->Start();
   // Install a listener to focus changes so that we can remove the card when
   // the focus gets changed. When called through the destruction of the bubble,
   // the FocusManager cannot be determined anymore and we remember it here.
   focus_manager_ = user_card_view_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 }
 
 void UserView::RemoveAddUserMenuOption() {
   if (!add_menu_option_.get())
     return;
   focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = NULL;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash