Providing more information on why certain users can't be added to multi-profile

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 475 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();
-  add_user_disabled_ = delegate->NumberOfLoggedInUsers() >=
-                       delegate->GetMaximumNumberOfLoggedInUsers();
+
+  bool IsMultiProfileAllowed =

[James Cook, 2014/08/11 17:01:34]

is_multi_profile_allowed (or just multi_profile_allowed)

[Roman Sorokin (ftl), 2014/08/11 17:41:45]

Done.

+      delegate->IsMultiProfileAllowedByPrimaryUserPolicy();
+  add_user_disabled_ = (delegate->NumberOfLoggedInUsers() >=
+                        delegate->GetMaximumNumberOfLoggedInUsers()) ||
+                       !IsMultiProfileAllowed;
+
   ButtonFromView* button = new ButtonFromView(
       add_user_view,
       add_user_disabled_ ? NULL : this,
       !add_user_disabled_,
       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_) {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+    int messageId;

[James Cook, 2014/08/11 17:01:34]

message_id

[Roman Sorokin (ftl), 2014/08/11 17:41:44]

Done.

+    if (!IsMultiProfileAllowed)
+      messageId = IDS_ASH_STATUS_TRAY_MESSAGE_NOT_ALLOWED_PRIMARY_USER;
+    else
+      messageId = IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER;
+
     popup_message_.reset(new PopupMessage(
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_CAPTION_CANNOT_ADD_USER),
-        bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_MESSAGE_CANNOT_ADD_USER),
+        bundle.GetLocalizedString(messageId),
         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);
@@ skipping 20 matching lines @@
   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