CrOS md user row adjustments

ash/common/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <vector>
 
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/user/tray_user.h"
 #include "ash/common/system/user/tray_user_separator.h"
 #include "ash/common/system/user/user_view.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
+namespace {
+
+bool UseMd() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial();
+}
+
 class TrayUserTest : public test::AshTestBase {
  public:
   TrayUserTest() = default;
 
   // testing::Test:
   void SetUp() override;
 
   // This has to be called prior to first use with the proper configuration.
   void InitializeParameters(int users_logged_in, bool multiprofile);
 
@@ skipping 13 matching lines @@
   TrayUserSeparator* tray_user_separator() { return tray_user_separator_; }
 
  private:
   SystemTray* tray_ = nullptr;
   test::TestSessionStateDelegate* delegate_ = nullptr;
 
   // Note that the ownership of these items is on the shelf.
   std::vector<TrayUser*> tray_user_;
 
   // The separator between the tray users and the rest of the menu.
-  // Note: The item will get owned by the shelf.
+  // Note: The item will get owned by the shelf. Not used in Material Design.
   TrayUserSeparator* tray_user_separator_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(TrayUserTest);
 };
 
 void TrayUserTest::SetUp() {
   test::AshTestBase::SetUp();
   tray_ = GetPrimarySystemTray();
   delegate_ = test::AshTestHelper::GetTestSessionStateDelegate();
 }
 
 void TrayUserTest::InitializeParameters(int users_logged_in,
                                         bool multiprofile) {
   // Set our default assumptions. Note that it is sufficient to set these
   // after everything was created.
   delegate_->set_logged_in_users(users_logged_in);
   test::TestShellDelegate* shell_delegate =
       static_cast<test::TestShellDelegate*>(WmShell::Get()->delegate());
   shell_delegate->set_multi_profiles_enabled(multiprofile);
 
   // Instead of using the existing tray panels we create new ones which makes
   // the access easier.
   for (int i = 0; i < delegate_->GetMaximumNumberOfLoggedInUsers(); i++) {
     tray_user_.push_back(new TrayUser(tray_, i));
     tray_->AddTrayItem(tray_user_[i]);
   }
-  // We then add also the separator.
-  tray_user_separator_ = new TrayUserSeparator(tray_);
-  tray_->AddTrayItem(tray_user_separator_);
+  if (!UseMd()) {
+    // We then add also the separator.
+    tray_user_separator_ = new TrayUserSeparator(tray_);
+    tray_->AddTrayItem(tray_user_separator_);
+  }
 }
 
 void TrayUserTest::ShowTrayMenu(ui::test::EventGenerator* generator) {
   gfx::Point center = tray()->GetBoundsInScreen().CenterPoint();
 
   generator->MoveMouseTo(center.x(), center.y());
   EXPECT_FALSE(tray()->IsAnyBubbleVisible());
   generator->ClickLeftButton();
 }
 
 void TrayUserTest::MoveOverUserItem(ui::test::EventGenerator* generator,
                                     int index) {
   gfx::Point center =
       tray_user(index)->GetUserPanelBoundsInScreenForTest().CenterPoint();
 
   generator->MoveMouseTo(center.x(), center.y());
 }
 
 void TrayUserTest::ClickUserItem(ui::test::EventGenerator* generator,
                                  int index) {
   MoveOverUserItem(generator, index);
   generator->ClickLeftButton();
 }
 
+}  // namespace
+
 // Make sure that we show items for all users in the tray accordingly.
 TEST_F(TrayUserTest, CheckTrayItemSize) {
   InitializeParameters(1, false);
   tray_user(0)->UpdateAfterLoginStatusChangeForTest(LoginStatus::GUEST);
   gfx::Size size = tray_user(0)->GetLayoutSizeForTest();
   EXPECT_EQ(kTrayItemSize, size.height());
   tray_user(0)->UpdateAfterLoginStatusChangeForTest(LoginStatus::USER);
   size = tray_user(0)->GetLayoutSizeForTest();
   EXPECT_EQ(kTrayItemSize, size.height());
 }
 
 // Make sure that in single user mode the user panel cannot be activated and no
 // separators are being created.
 TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
   InitializeParameters(1, false);
 
   // Move the mouse over the status area and click to open the status menu.
   ui::test::EventGenerator& generator = GetEventGenerator();
 
   EXPECT_FALSE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
     EXPECT_EQ(TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
-  EXPECT_FALSE(tray_user_separator()->separator_shown());
+  if (!UseMd())
+    EXPECT_FALSE(tray_user_separator()->separator_shown());
 
   ShowTrayMenu(&generator);
 
   EXPECT_TRUE(tray()->HasSystemBubble());
   EXPECT_TRUE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
     EXPECT_EQ(i == 0 ? TrayUser::SHOWN : TrayUser::HIDDEN,
               tray_user(i)->GetStateForTest());
-  EXPECT_FALSE(tray_user_separator()->separator_shown());
+  if (!UseMd())
+    EXPECT_FALSE(tray_user_separator()->separator_shown());
   tray()->CloseSystemBubble();
 }
 
 TEST_F(TrayUserTest, AccessibleLabelContainsSingleUserInfo) {
   InitializeParameters(1, false);
   ui::test::EventGenerator& generator = GetEventGenerator();
   ShowTrayMenu(&generator);
 
   views::View* view =
       tray_user(0)->user_view_for_test()->user_card_view_for_test();
@@ skipping 35 matching lines @@
   int max_users = delegate()->GetMaximumNumberOfLoggedInUsers();
   // Checking now for each amount of users that the correct is done.
   for (int j = 1; j < max_users; j++) {
     // Set the number of logged in users.
     delegate()->set_logged_in_users(j);
 
     // Verify that nothing is shown.
     EXPECT_FALSE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < max_users; i++)
       EXPECT_FALSE(tray_user(i)->GetStateForTest());
-    EXPECT_FALSE(tray_user_separator()->separator_shown());
+    if (!UseMd())
+      EXPECT_FALSE(tray_user_separator()->separator_shown());
     // After clicking on the tray the menu should get shown and for each logged
     // in user we should get a visible item. In addition, the separator should
     // show up when we reach more than one user.
     ShowTrayMenu(&generator);
 
     EXPECT_TRUE(tray()->HasSystemBubble());
     EXPECT_TRUE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < max_users; i++) {
       EXPECT_EQ(i < j ? TrayUser::SHOWN : TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
     // Check the visibility of the separator.
-    EXPECT_EQ(j > 1 ? true : false, tray_user_separator()->separator_shown());
+    if (!UseMd())
+      EXPECT_EQ(j > 1 ? true : false, tray_user_separator()->separator_shown());
 
     // Move the mouse over the user item and it should hover.
     MoveOverUserItem(&generator, 0);
     EXPECT_EQ(TrayUser::HOVERED, tray_user(0)->GetStateForTest());
     for (int i = 1; i < max_users; i++) {
       EXPECT_EQ(i < j ? TrayUser::SHOWN : TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
     // Check that clicking the button allows to add item if we have still room
@@ skipping 30 matching lines @@
   // Since the name is capitalized, the email should be different than the
   // user_id.
   EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
             second_user->GetDisplayEmail());
   tray()->CloseSystemBubble();
 }
 
 #endif
 
 }  // namespace ash