Do not show holding space tray button if there are no items

Bug: 1138541
Change-Id: I3984809ea6144823145d70eaeb443c730563fb4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2473379
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#819952}

ash/ash_prefs.cc

@@ -18,6 +18,7 @@
 #include "ash/magnifier/docked_magnifier_controller_impl.h"
 #include "ash/media/media_controller_impl.h"
 #include "ash/public/cpp/ash_pref_names.h"
+#include "ash/public/cpp/holding_space/holding_space_prefs.h"
 #include "ash/shelf/contextual_tooltip.h"
 #include "ash/shelf/shelf_controller.h"
 #include "ash/style/ash_color_provider.h"
@@ -61,6 +62,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test) {
   DockedMagnifierControllerImpl::RegisterProfilePrefs(registry);
   GestureEducationNotificationController::RegisterProfilePrefs(registry,
                                                                for_test);
+  holding_space_prefs::RegisterProfilePrefs(registry);
   LoginScreenController::RegisterProfilePrefs(registry, for_test);
   LogoutButtonTray::RegisterProfilePrefs(registry);
   KeyboardControllerImpl::RegisterProfilePrefs(registry);

ash/public/cpp/holding_space/holding_space_prefs.cc

@@ -6,7 +6,7 @@
 
 #include "base/time/time.h"
 #include "base/util/values/values_util.h"
-#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 
 namespace ash {
@@ -26,7 +26,7 @@ constexpr char kTimeOfFirstPin[] = "ash.holding_space.time_of_first_pin";
 
 }  // namespace
 
-void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterTimePref(kTimeOfFirstAvailability, base::Time::UnixEpoch());
   registry->RegisterTimePref(kTimeOfFirstEntry, base::Time::UnixEpoch());
   registry->RegisterTimePref(kTimeOfFirstPin, base::Time::UnixEpoch());

ash/public/cpp/holding_space/holding_space_prefs.h

@@ -8,22 +8,18 @@
 #include "ash/public/cpp/ash_public_export.h"
 #include "base/optional.h"
 
+class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class Time;
 }  // namespace base
 
-namespace user_prefs {
-class PrefRegistrySyncable;
-}  // namespace user_prefs
-
 namespace ash {
 namespace holding_space_prefs {
 
 // Registers holding space profile preferences to `registry`.
-ASH_PUBLIC_EXPORT void RegisterProfilePrefs(
-    user_prefs::PrefRegistrySyncable* registry);
+ASH_PUBLIC_EXPORT void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
 // Returns the time when holding space first became available. Note that if the
 // time of first availability is unmarked, `base::nullopt` is returned.

ash/shell.cc

@@ -882,7 +882,7 @@ Shell::~Shell() {
   // Destroys the MessageCenter singleton, so must happen late.
   message_center_controller_.reset();
 
-  // HoldingSpaceController observes SessionController and must be
+  // `HoldingSpaceController` observes `SessionController` and must be
   // destructed before it.
   holding_space_controller_.reset();
 
@@ -1033,6 +1033,13 @@ void Shell::Init(
     clipboard_history_controller_ =
         std::make_unique<ClipboardHistoryControllerImpl>();
   }
+
+  // `HoldingSpaceController` must be instantiated before the shelf.
+  if (features::IsTemporaryHoldingSpaceEnabled()) {
+    holding_space_controller_ = std::make_unique<HoldingSpaceController>(
+        std::make_unique<HoldingSpaceColorProviderImpl>());
+  }
+
   shelf_config_ = std::make_unique<ShelfConfig>();
   shelf_controller_ = std::make_unique<ShelfController>();
 
@@ -1259,11 +1266,6 @@ void Shell::Init(
         std::make_unique<DisplayAlignmentController>();
   }
 
-  if (features::IsTemporaryHoldingSpaceEnabled()) {
-    holding_space_controller_ = std::make_unique<HoldingSpaceController>(
-        std::make_unique<HoldingSpaceColorProviderImpl>());
-  }
-
   for (auto& observer : shell_observers_)
     observer.OnShellInitialized();
 

ash/system/holding_space/holding_space_tray.cc

@@ -8,9 +8,11 @@
 #include "ash/accessibility/accessibility_controller_impl.h"
 #include "ash/public/cpp/holding_space/holding_space_constants.h"
 #include "ash/public/cpp/holding_space/holding_space_metrics.h"
+#include "ash/public/cpp/holding_space/holding_space_prefs.h"
 #include "ash/public/cpp/shelf_config.h"
 #include "ash/public/cpp/system_tray_client.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/session/session_controller_impl.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
@@ -26,6 +28,9 @@
 namespace ash {
 
 HoldingSpaceTray::HoldingSpaceTray(Shelf* shelf) : TrayBackgroundView(shelf) {
+  controller_observer_.Add(HoldingSpaceController::Get());
+  SetVisible(false);
+
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
   icon_ = tray_container()->AddChildView(std::make_unique<views::ImageView>());
@@ -58,8 +63,7 @@ void HoldingSpaceTray::AnchorUpdated() {
 }
 
 void HoldingSpaceTray::UpdateAfterLoginStatusChange() {
-  SetVisiblePreferred(shelf()->GetStatusAreaWidget()->login_status() ==
-                      LoginStatus::USER);
+  UpdateVisibility();
 }
 
 bool HoldingSpaceTray::PerformAction(const ui::Event& event) {
@@ -124,6 +128,28 @@ const char* HoldingSpaceTray::GetClassName() const {
   return "HoldingSpaceTray";
 }
 
+void HoldingSpaceTray::UpdateVisibility() {
+  HoldingSpaceModel* model = HoldingSpaceController::Get()->model();
+
+  bool logged_in =
+      shelf()->GetStatusAreaWidget()->login_status() == LoginStatus::USER;
+
+  if (!model || !logged_in) {
+    SetVisiblePreferred(false);
+    return;
+  }
+
+  PrefService* active_pref_service =
+      Shell::Get()->session_controller()->GetActivePrefService();
+  bool has_ever_pinned_item =
+      active_pref_service
+          ? holding_space_prefs::GetTimeOfFirstPin(active_pref_service)
+                .has_value()
+          : false;
+
+  SetVisiblePreferred(!model->items().empty() || !has_ever_pinned_item);
+}
+
 base::string16 HoldingSpaceTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
@@ -136,6 +162,24 @@ void HoldingSpaceTray::HideBubble(const TrayBubbleView* bubble_view) {
   CloseBubble();
 }
 
+void HoldingSpaceTray::OnHoldingSpaceModelAttached(HoldingSpaceModel* model) {
+  model_observer_.Add(model);
+  UpdateVisibility();
+}
+
+void HoldingSpaceTray::OnHoldingSpaceModelDetached(HoldingSpaceModel* model) {
+  model_observer_.Remove(model);
+  UpdateVisibility();
+}
+
+void HoldingSpaceTray::OnHoldingSpaceItemAdded(const HoldingSpaceItem* item) {
+  UpdateVisibility();
+}
+
+void HoldingSpaceTray::OnHoldingSpaceItemRemoved(const HoldingSpaceItem* item) {
+  UpdateVisibility();
+}
+
 void HoldingSpaceTray::OnWidgetDragWillStart(views::Widget* widget) {
   // The holding space bubble should be closed while dragging holding space
   // items so as not to obstruct drop targets. Post the task to close the bubble

ash/system/holding_space/holding_space_tray.h

@@ -8,9 +8,14 @@
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/public/cpp/holding_space/holding_space_controller.h"
+#include "ash/public/cpp/holding_space/holding_space_controller_observer.h"
+#include "ash/public/cpp/holding_space/holding_space_model.h"
+#include "ash/public/cpp/holding_space/holding_space_model_observer.h"
 #include "ash/system/holding_space/holding_space_tray_bubble.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace views {
@@ -22,6 +27,8 @@ namespace ash {
 // This class also controls the lifetime for all of the tools available in the
 // palette. HoldingSpaceTray has one instance per-display.
 class ASH_EXPORT HoldingSpaceTray : public TrayBackgroundView,
+                                    public HoldingSpaceControllerObserver,
+                                    public HoldingSpaceModelObserver,
                                     public views::WidgetObserver {
  public:
   explicit HoldingSpaceTray(Shelf* shelf);
@@ -43,11 +50,21 @@ class ASH_EXPORT HoldingSpaceTray : public TrayBackgroundView,
   const char* GetClassName() const override;
 
  private:
+  void UpdateVisibility();
+
   // TrayBubbleView::Delegate:
   base::string16 GetAccessibleNameForBubble() override;
   bool ShouldEnableExtraKeyboardAccessibility() override;
   void HideBubble(const TrayBubbleView* bubble_view) override;
 
+  // HoldingSpaceControllerObserver:
+  void OnHoldingSpaceModelAttached(HoldingSpaceModel* model) override;
+  void OnHoldingSpaceModelDetached(HoldingSpaceModel* model) override;
+
+  // HoldingSpaceModelObserver:
+  void OnHoldingSpaceItemAdded(const HoldingSpaceItem* item) override;
+  void OnHoldingSpaceItemRemoved(const HoldingSpaceItem* item) override;
+
   // views::WidgetObserver:
   void OnWidgetDragWillStart(views::Widget* widget) override;
   void OnWidgetDestroying(views::Widget* widget) override;
@@ -57,6 +74,11 @@ class ASH_EXPORT HoldingSpaceTray : public TrayBackgroundView,
   // Weak pointer, will be parented by TrayContainer for its lifetime.
   views::ImageView* icon_ = nullptr;
 
+  ScopedObserver<HoldingSpaceController, HoldingSpaceControllerObserver>
+      controller_observer_{this};
+  ScopedObserver<HoldingSpaceModel, HoldingSpaceModelObserver> model_observer_{
+      this};
+
   base::WeakPtrFactory<HoldingSpaceTray> weak_factory_{this};
 };
 

chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc

@@ -72,13 +72,18 @@ HoldingSpaceKeyedService::HoldingSpaceKeyedService(Profile* profile,
   profile_manager_observer_.Add(profile_manager);
 }
 
-HoldingSpaceKeyedService::~HoldingSpaceKeyedService() = default;
+HoldingSpaceKeyedService::~HoldingSpaceKeyedService() {
+  if (HoldingSpaceController::Get()) {
+    // For BrowserWithTestWindowTest that releases profile and its keyed
+    // services before ash Shell.
+    HoldingSpaceController::Get()->RegisterClientAndModelForUser(
+        account_id_, /*client=*/nullptr, /*model=*/nullptr);
+  }
+}
 
 // static
 void HoldingSpaceKeyedService::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  holding_space_prefs::RegisterProfilePrefs(registry);
-
   // TODO(crbug.com/1131266): Move to `ash::holding_space_prefs`.
   HoldingSpacePersistenceDelegate::RegisterProfilePrefs(registry);
 }