Don't attempt to update holding space item chip view pin if deleted.

Unpinning an item from its view may result in that view being deleted.
If the view is deleted, we shouldn't attempt to update its pin.

Bug: 1130086
Change-Id: Ib5c8dbe086b4446161569924b3c81a9bd37d272c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422247
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809526}

ash/system/holding_space/holding_space_item_chip_view.cc

@@ -63,9 +63,9 @@ HoldingSpaceItemChipView::HoldingSpaceItemChipView(const HoldingSpaceItem* item)
   // Subscribe to be notified of changes to `item_`'s image.
   image_subscription_ =
       item->image().AddImageSkiaChangedCallback(base::BindRepeating(
-          &HoldingSpaceItemChipView::Update, base::Unretained(this)));
+          &HoldingSpaceItemChipView::UpdateImage, base::Unretained(this)));
 
-  Update();
+  UpdateImage();
 }
 
 HoldingSpaceItemChipView::~HoldingSpaceItemChipView() = default;
@@ -85,15 +85,19 @@ void HoldingSpaceItemChipView::OnMouseEvent(ui::MouseEvent* event) {
 void HoldingSpaceItemChipView::ButtonPressed(views::Button* sender,
                                              const ui::Event& event) {
   DCHECK_EQ(sender, pin_);
-  bool is_item_pinned = HoldingSpaceController::Get()->model()->GetItem(
+  const bool is_item_pinned = HoldingSpaceController::Get()->model()->GetItem(
       HoldingSpaceItem::GetFileBackedItemId(HoldingSpaceItem::Type::kPinnedFile,
                                             item()->file_path()));
-  pin_->SetToggled(!is_item_pinned);
 
+  // Unpinning `item()` may result in the destruction of this view.
+  auto weak_ptr = weak_factory_.GetWeakPtr();
   if (is_item_pinned)
     HoldingSpaceController::Get()->client()->UnpinItem(*item());
   else
     HoldingSpaceController::Get()->client()->PinItem(*item());
+
+  if (weak_ptr)
+    UpdatePin();
 }
 
 void HoldingSpaceItemChipView::AddPinButton() {
@@ -112,7 +116,7 @@ void HoldingSpaceItemChipView::AddPinButton() {
   pin_->SetToggledImage(views::Button::STATE_NORMAL, &pinned_icon);
 }
 
-void HoldingSpaceItemChipView::Update() {
+void HoldingSpaceItemChipView::UpdateImage() {
   image_->SetImage(
       item()->image().image_skia(),
       gfx::Size(kHoldingSpaceChipIconSize, kHoldingSpaceChipIconSize));
@@ -124,7 +128,7 @@ void HoldingSpaceItemChipView::UpdatePin() {
     return;
   }
 
-  bool is_item_pinned = HoldingSpaceController::Get()->model()->GetItem(
+  const bool is_item_pinned = HoldingSpaceController::Get()->model()->GetItem(
       HoldingSpaceItem::GetFileBackedItemId(HoldingSpaceItem::Type::kPinnedFile,
                                             item()->file_path()));
 

ash/system/holding_space/holding_space_item_chip_view.h

@@ -46,7 +46,7 @@ class ASH_EXPORT HoldingSpaceItemChipView : public HoldingSpaceItemView,
 
  private:
   void AddPinButton();
-  void Update();
+  void UpdateImage();
   void UpdatePin();
 
   tray::RoundedImageView* image_ = nullptr;
@@ -54,6 +54,8 @@ class ASH_EXPORT HoldingSpaceItemChipView : public HoldingSpaceItemView,
   views::ToggleImageButton* pin_ = nullptr;
 
   std::unique_ptr<HoldingSpaceImage::Subscription> image_subscription_;
+
+  base::WeakPtrFactory<HoldingSpaceItemChipView> weak_factory_{this};
 };
 
 }  // namespace ash