Stop the OverviewButton from appearing on the Add-User screen

ash/system/overview/overview_button_tray_unittest.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/overview/overview_button_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/user/login_status.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_helper.h"
 #include "ash/test/status_area_widget_test_helper.h"
+#include "ash/test/test_session_state_delegate.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "base/command_line.h"
 #include "base/test/user_action_tester.h"
 #include "base/time/time.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 11 matching lines @@
 
 }  // namespace
 
 class OverviewButtonTrayTest : public test::AshTestBase {
  public:
   OverviewButtonTrayTest() {}
   ~OverviewButtonTrayTest() override {}
 
   void SetUp() override;
 
+  void NotifySessionStateChanged();
+
  protected:
   views::ImageView* GetImageView(OverviewButtonTray* tray) {
     return tray->icon_;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OverviewButtonTrayTest);
 };
 
 void OverviewButtonTrayTest::SetUp() {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kAshUseFirstDisplayAsInternal);
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kAshEnableScreenRotationAnimation);
   AshTestBase::SetUp();
 }
 
+void OverviewButtonTrayTest::NotifySessionStateChanged() {
+  GetTray()->SessionStateChanged(
+      ash_test_helper()->GetTestSessionStateDelegate()->GetSessionState());
+}
+
 // Ensures that creation doesn't cause any crashes and adds the image icon.
 TEST_F(OverviewButtonTrayTest, BasicConstruction) {
   EXPECT_TRUE(GetImageView(GetTray()) != NULL);
 }
 
 // Test that maximize mode toggle changes visibility.
 // OverviewButtonTray should only be visible when MaximizeMode is enabled.
 // By default the system should not have MaximizeMode enabled.
 TEST_F(OverviewButtonTrayTest, MaximizeModeObserverOnMaximizeModeToggled) {
   ASSERT_FALSE(GetTray()->visible());
@@ skipping 90 matching lines @@
 TEST_F(OverviewButtonTrayTest, VisibilityChangesForLoginStatus) {
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(true);
   SetUserLoggedIn(false);
   Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_NONE);
   EXPECT_FALSE(GetTray()->visible());
   SetUserLoggedIn(true);
   SetSessionStarted(true);
   Shell::GetInstance()->UpdateAfterLoginStatusChange(user::LOGGED_IN_USER);
   EXPECT_TRUE(GetTray()->visible());
+  SetUserAddingScreenRunning(true);
+  NotifySessionStateChanged();
+  EXPECT_FALSE(GetTray()->visible());
+  SetUserAddingScreenRunning(false);
+  NotifySessionStateChanged();
+  EXPECT_TRUE(GetTray()->visible());
   Shell::GetInstance()->maximize_mode_controller()->
       EnableMaximizeModeWindowManager(false);
 }
 
 // Tests that the tray only renders as active while selection is ongoing. Any
 // dismissal of overview mode clears the active state.
 TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
   ASSERT_FALSE(
       Shell::GetInstance()->window_selector_controller()->IsSelecting());
   ASSERT_FALSE(GetTray()->draw_background_as_active());
@@ skipping 32 matching lines @@
   scoped_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
   ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())
       .Rotate(gfx::Display::ROTATE_270, gfx::Display::ROTATION_SOURCE_ACTIVE);
 
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(GetTray()->visible());
 }
 
+// Tests that the overview button becomes visible when the user enters
+// maximize mode with a system modal window open, and that it hides once
+// the user exits maximize mode.
+TEST_F(OverviewButtonTrayTest, VisibilityChangesForSystemModalWindow) {
+  // TODO(jonross): When CreateTestWindow*() have been unified, use the
+  // appropriate method to replace this setup. (crbug.com/483503)
+  scoped_ptr<aura::Window> window(new aura::Window(nullptr));
+  window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
+  window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
+  window->Init(ui::LAYER_TEXTURED);
+  window->Show();
+  ParentWindowInPrimaryRootWindow(window.get());
+
+  ASSERT_TRUE(Shell::GetInstance()->IsSystemModalWindowOpen());
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(true);
+  EXPECT_TRUE(GetTray()->visible());
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->EnableMaximizeModeWindowManager(false);
+  EXPECT_FALSE(GetTray()->visible());
+}
+
 }  // namespace ash