Hide holding space tray on user adding screen.

Previously the holding space tray did not update visibility when the
user adding screen was shown and interacting with holding space items
appeared to no-op to the user since actions were being performed behind
the login screen.

Bug: 1168059
Change-Id: I8a55e811b2eb74edeecdcae11dc811173420aff8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2643412Reviewed-by: Toni Baržić <tbarzic@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#846211}

ash/system/holding_space/holding_space_tray.cc

@@ -69,6 +69,7 @@ std::unique_ptr<views::ImageView> CreateDefaultTrayIcon() {
 
 HoldingSpaceTray::HoldingSpaceTray(Shelf* shelf) : TrayBackgroundView(shelf) {
   controller_observer_.Observe(HoldingSpaceController::Get());
+  session_observer_.Observe(Shell::Get()->session_controller());
   SetVisible(false);
 
   // Icon.
@@ -82,7 +83,6 @@ HoldingSpaceTray::HoldingSpaceTray(Shelf* shelf) : TrayBackgroundView(shelf) {
 
     // If previews feature is enabled, the preview icon is displayed
     // conditionally, depending on user prefs state.
-    session_observer_.Observe(Shell::Get()->session_controller());
     auto* prefs = Shell::Get()->session_controller()->GetActivePrefService();
     if (prefs)
       ObservePrefService(prefs);
@@ -212,11 +212,8 @@ void HoldingSpaceTray::FirePreviewsUpdateTimerIfRunningForTesting() {
 }
 
 void HoldingSpaceTray::UpdateVisibility() {
-  HoldingSpaceModel* model = HoldingSpaceController::Get()->model();
-  LoginStatus login_status = shelf()->GetStatusAreaWidget()->login_status();
-  const bool in_active_session = login_status != LoginStatus::NOT_LOGGED_IN &&
-                                 login_status != LoginStatus::LOCKED;
-  if (!model || !in_active_session) {
+  HoldingSpaceModel* const model = HoldingSpaceController::Get()->model();
+  if (!model || Shell::Get()->session_controller()->IsUserSessionBlocked()) {
     SetVisiblePreferred(false);
     return;
   }
@@ -363,10 +360,18 @@ void HoldingSpaceTray::OnWidgetDestroying(views::Widget* widget) {
 }
 
 void HoldingSpaceTray::OnActiveUserPrefServiceChanged(PrefService* prefs) {
+  if (!features::IsTemporaryHoldingSpacePreviewsEnabled())
+    return;
+
   UpdatePreviewsState();
   ObservePrefService(prefs);
 }
 
+void HoldingSpaceTray::OnSessionStateChanged(
+    session_manager::SessionState state) {
+  UpdateVisibility();
+}
+
 void HoldingSpaceTray::ObservePrefService(PrefService* prefs) {
   pref_change_registrar_ = std::make_unique<PrefChangeRegistrar>();
   pref_change_registrar_->Init(prefs);

ash/system/holding_space/holding_space_tray.h

@@ -97,6 +97,7 @@ class ASH_EXPORT HoldingSpaceTray : public TrayBackgroundView,
 
   // SessionObserver:
   void OnActiveUserPrefServiceChanged(PrefService* prefs) override;
+  void OnSessionStateChanged(session_manager::SessionState state) override;
 
   // ui::SimpleMenuModel::Delegate:
   void ExecuteCommand(int command_id, int event_flags) override;

ash/system/holding_space/holding_space_tray_unittest.cc

@@ -396,6 +396,27 @@ TEST_P(HoldingSpaceTrayTest, HideButtonOnChangeToNonEmptyModel) {
   UnregisterModelForUser("user@secondary");
 }
 
+TEST_P(HoldingSpaceTrayTest, HideButtonOnUserAddingScreen) {
+  MarkTimeOfFirstPin();
+  StartSession();
+
+  // The tray button should be hidden if the user has previously pinned an item
+  // and the holding space is empty.
+  EXPECT_FALSE(test_api()->IsShowingInShelf());
+
+  // The tray button should be showing if the user has an item in holding space.
+  AddItem(HoldingSpaceItem::Type::kDownload, base::FilePath("/tmp/fake_1"));
+  EXPECT_TRUE(test_api()->IsShowingInShelf());
+
+  // The tray button should be hidden if the user adding screen is running.
+  SetUserAddingScreenRunning(true);
+  EXPECT_FALSE(test_api()->IsShowingInShelf());
+
+  // The tray button should be showing if the user adding screen is finished.
+  SetUserAddingScreenRunning(false);
+  EXPECT_TRUE(test_api()->IsShowingInShelf());
+}
+
 TEST_P(HoldingSpaceTrayTest, AddingItemShowsTrayBubble) {
   MarkTimeOfFirstPin();
   StartSession();