Reland 097f9cde453ea57eb4aa037f44add782391c5eb9

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 <utility>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 19 matching lines @@
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace tray {
 
 namespace {
@@ skipping 16 matching lines @@
   controller->SwitchActiveUser(
       controller->GetUserSession(user_index)->account_id);
 }
 
 bool IsMultiProfileSupportedAndUserActive() {
   return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
          !Shell::Get()->session_controller()->IsUserSessionBlocked();
 }
 
 // Creates the view shown in the user switcher popup ("AddUserMenuOption").
-views::View* CreateAddUserView(AddUserSessionPolicy policy,
-                               views::ButtonListener* listener) {
+views::View* CreateAddUserView(AddUserSessionPolicy policy) {
   auto* view = new views::View;
   const int icon_padding = (kMenuButtonSize - kMenuIconSize) / 2;
   auto* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                            kTrayPopupLabelHorizontalPadding + icon_padding);
   layout->set_minimum_cross_axis_size(kTrayPopupItemMinHeight);
   view->SetLayoutManager(layout);
-  view->set_background(
-      views::Background::CreateSolidBackground(kBackgroundColor));
+  view->set_background(views::Background::CreateThemedSolidBackground(
+      view, ui::NativeTheme::kColorId_BubbleBackground));
 
   int message_id = 0;
   switch (policy) {
     case AddUserSessionPolicy::ALLOWED: {
       message_id = IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT;
 
       auto* icon = new views::ImageView();
       icon->SetImage(
           gfx::CreateVectorIcon(kSystemMenuNewUserIcon, kMenuIconColor));
       view->AddChildView(icon);
@@ skipping 20 matching lines @@
   if (policy != AddUserSessionPolicy::ALLOWED) {
     label_style.set_font_style(TrayPopupItemStyle::FontStyle::CAPTION);
     label_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
     vertical_padding += kMenuSeparatorVerticalPadding;
   }
   label_style.SetupLabel(command_label);
   view->AddChildView(command_label);
   view->SetBorder(views::CreateEmptyBorder(vertical_padding, icon_padding,
                                            vertical_padding,
                                            kTrayPopupLabelHorizontalPadding));
-  if (policy == AddUserSessionPolicy::ALLOWED) {
-    auto* button =
-        new ButtonFromView(view, listener, TrayPopupInkDropStyle::INSET_BOUNDS);
-    button->SetAccessibleName(
-        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
-    return button;
-  }
 
   return view;
 }
 
 class UserViewMouseWatcherHost : public views::MouseWatcherHost {
  public:
   explicit UserViewMouseWatcherHost(const gfx::Rect& screen_area)
       : screen_area_(screen_area) {}
   ~UserViewMouseWatcherHost() override {}
 
@@ skipping 77 matching lines @@
   auto* layout = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
   SetLayoutManager(layout);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   layout->SetFlexForView(user_card_container_, 1);
 
   SetBorder(base::MakeUnique<ActiveUserBorder>());
 }
 
 UserView::~UserView() {
-  RemoveAddUserMenuOption();
+  HideUserDropdownWidget();
 }
 
 TrayUser::TestState UserView::GetStateForTest() const {
-  if (add_menu_option_)
+  if (user_dropdown_widget_)
     return add_user_enabled_ ? TrayUser::ACTIVE : TrayUser::ACTIVE_BUT_DISABLED;
 
   // If the container is the user card view itself, there's no ButtonFromView
   // wrapping it.
   if (user_card_container_ == user_card_view_)
     return TrayUser::SHOWN;
 
   return static_cast<ButtonFromView*>(user_card_container_)
                  ->is_hovered_for_test()
              ? TrayUser::HOVERED
              : TrayUser::SHOWN;
 }
 
 gfx::Rect UserView::GetBoundsInScreenOfUserButtonForTest() {
   return user_card_container_->GetBoundsInScreen();
 }
 
 int UserView::GetHeightForWidth(int width) const {
   return GetPreferredSize().height();
 }
 
 void UserView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   if (sender == logout_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_SIGN_OUT);
-    RemoveAddUserMenuOption();
+    HideUserDropdownWidget();
     Shell::Get()->system_tray_controller()->SignOut();
   } else if (sender == user_card_container_ &&
              IsMultiProfileSupportedAndUserActive()) {
-    ToggleAddUserMenuOption();
-  } else if (add_menu_option_ &&
-             sender->GetWidget() == add_menu_option_.get()) {
+    ToggleUserDropdownWidget();
+  } else if (user_dropdown_widget_ &&
+             sender->GetWidget() == user_dropdown_widget_.get()) {
     DCHECK_EQ(Shell::Get()->session_controller()->NumberOfLoggedInUsers(),
               sender->parent()->child_count() - 1);
     const int index_in_add_menu = sender->parent()->GetIndexOf(sender);
     // The last item is the "sign in another user" row.
     if (index_in_add_menu == sender->parent()->child_count() - 1) {
       MultiProfileUMA::RecordSigninUser(MultiProfileUMA::SIGNIN_USER_BY_TRAY);
       Shell::Get()->system_tray_delegate()->ShowUserLogin();
     } else {
       const int user_index = index_in_add_menu;
       SwitchUser(user_index);
     }
-    RemoveAddUserMenuOption();
+    HideUserDropdownWidget();
     owner_->system_tray()->CloseSystemBubble();
   } else {
     NOTREACHED();
   }
 }
 
 void UserView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   if (focused_now)
-    RemoveAddUserMenuOption();
+    HideUserDropdownWidget();
 }
 
 void UserView::OnDidChangeFocus(View* focused_before, View* focused_now) {
   // Nothing to do here.
 }
 
 void UserView::AddLogoutButton(LoginStatus login) {
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
   logout_button_ = TrayPopupUtils::CreateTrayPopupBorderlessButton(
       this, user::GetLocalizedSignOutStringForStatus(login, true));
   AddChildView(logout_button_);
 }
 
 void UserView::AddUserCard(LoginStatus login) {
   DCHECK(!user_card_container_);
   DCHECK(!user_card_view_);
   user_card_view_ = new UserCardView(login, 0);
   // The entry is clickable when no system modal dialog is open and the multi
   // profile option is active.
   if (!ShellPort::Get()->IsSystemModalWindowOpen() &&
       IsMultiProfileSupportedAndUserActive()) {
     user_card_container_ = new ButtonFromView(
         user_card_view_, this, TrayPopupInkDropStyle::INSET_BOUNDS);
   } else {
     user_card_container_ = user_card_view_;
   }
   AddChildViewAt(user_card_container_, 0);
 }
 
-void UserView::ToggleAddUserMenuOption() {
-  if (add_menu_option_) {
-    RemoveAddUserMenuOption();
+void UserView::ToggleUserDropdownWidget() {
+  if (user_dropdown_widget_) {
+    HideUserDropdownWidget();
     return;
   }
 
   // Note: We do not need to install a global event handler to delete this
   // item since it will destroyed automatically before the menu / user menu item
   // gets destroyed..
-  add_menu_option_.reset(new views::Widget);
+  user_dropdown_widget_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_MENU;
   params.keep_on_top = true;
   params.accept_events = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.name = "AddUserMenuOption";
   WmWindow::Get(GetWidget()->GetNativeWindow())
       ->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
-          add_menu_option_.get(), kShellWindowId_DragImageAndTooltipContainer,
-          &params);
-  add_menu_option_->Init(params);
+          user_dropdown_widget_.get(),
+          kShellWindowId_DragImageAndTooltipContainer, &params);
+  user_dropdown_widget_->Init(params);
 
   const SessionController* const session_controller =
       Shell::Get()->session_controller();
   const AddUserSessionPolicy add_user_policy =
       session_controller->GetAddUserPolicy();
   add_user_enabled_ = add_user_policy == AddUserSessionPolicy::ALLOWED;
 
   // Position the widget on top of the user card view (which is still in the
   // system menu). The top half of the widget will be transparent to allow
   // the active user to show through.
   gfx::Rect bounds = user_card_container_->GetBoundsInScreen();
   bounds.set_width(bounds.width() + kSeparatorWidth);
   int row_height = bounds.height();
 
   views::View* container = new UserDropdownWidgetContents(
-      base::Bind(&UserView::RemoveAddUserMenuOption, base::Unretained(this)));
+      base::Bind(&UserView::HideUserDropdownWidget, base::Unretained(this)));
+  views::View* add_user_view = CreateAddUserView(add_user_policy);
+  const SkColor bg_color = add_user_view->background()->get_color();
   container->SetBorder(views::CreatePaddedBorder(
-      views::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth, kBackgroundColor),
+      views::CreateSolidSidedBorder(0, 0, 0, kSeparatorWidth, bg_color),
       gfx::Insets(row_height, 0, 0, 0)));
+
+  // Create the contents aside from the empty window through which the active
+  // user is seen.
   views::View* user_dropdown_padding = new views::View();
   user_dropdown_padding->SetBorder(views::CreateSolidSidedBorder(
-      kMenuSeparatorVerticalPadding - kSeparatorWidth, 0, 0, 0,
-      kBackgroundColor));
+      kMenuSeparatorVerticalPadding - kSeparatorWidth, 0, 0, 0, bg_color));
   user_dropdown_padding->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   views::Separator* separator = new views::Separator();
   separator->SetPreferredHeight(kSeparatorWidth);
-  separator->SetColor(color_utils::GetResultingPaintColor(kMenuSeparatorColor,
-                                                          kBackgroundColor));
+  separator->SetColor(
+      color_utils::GetResultingPaintColor(kMenuSeparatorColor, bg_color));
   const int separator_horizontal_padding =
       (kTrayPopupItemMinStartWidth - kTrayItemSize) / 2;
-  separator->SetBorder(views::CreateSolidSidedBorder(
-      0, separator_horizontal_padding, 0, separator_horizontal_padding,
-      kBackgroundColor));
+  separator->SetBorder(
+      views::CreateSolidSidedBorder(0, separator_horizontal_padding, 0,
+                                    separator_horizontal_padding, bg_color));
   user_dropdown_padding->AddChildView(separator);
 
+  // Add other logged in users.
   for (int i = 1; i < session_controller->NumberOfLoggedInUsers(); ++i) {
     user_dropdown_padding->AddChildView(
         new ButtonFromView(new UserCardView(LoginStatus::USER, i), this,
                            TrayPopupInkDropStyle::INSET_BOUNDS));
   }
 
-  user_dropdown_padding->AddChildView(CreateAddUserView(add_user_policy, this));
+  // Add the "add user" option or the "can't add another user" message.
+  if (add_user_enabled_) {
+    auto* button = new ButtonFromView(add_user_view, this,
+                                      TrayPopupInkDropStyle::INSET_BOUNDS);
+    button->SetAccessibleName(
+        l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SIGN_IN_ANOTHER_ACCOUNT));
+    user_dropdown_padding->AddChildView(button);
+  } else {
+    user_dropdown_padding->AddChildView(add_user_view);
+  }
+
   container->AddChildView(user_dropdown_padding);
   container->SetLayoutManager(new views::FillLayout());
-  add_menu_option_->SetContentsView(container);
+  user_dropdown_widget_->SetContentsView(container);
 
   bounds.set_height(container->GetPreferredSize().height());
-  add_menu_option_->SetBounds(bounds);
+  user_dropdown_widget_->SetBounds(bounds);
 
   // Suppress the appearance of the collective capture icon while the dropdown
   // is open (the icon will appear in the specific user rows).
   user_card_view_->SetSuppressCaptureIcon(true);
 
   // Show the content.
-  add_menu_option_->SetAlwaysOnTop(true);
-  add_menu_option_->Show();
+  user_dropdown_widget_->SetAlwaysOnTop(true);
+  user_dropdown_widget_->Show();
 
   // 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_container_->GetFocusManager();
   focus_manager_->AddFocusChangeListener(this);
 }
 
-void UserView::RemoveAddUserMenuOption() {
-  if (!add_menu_option_)
+void UserView::HideUserDropdownWidget() {
+  if (!user_dropdown_widget_)
     return;
   focus_manager_->RemoveFocusChangeListener(this);
   focus_manager_ = nullptr;
   if (user_card_container_->GetFocusManager())
     user_card_container_->GetFocusManager()->ClearFocus();
   user_card_view_->SetSuppressCaptureIcon(false);
-  add_menu_option_.reset();
+  user_dropdown_widget_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash