Commit d230746b authored by Toni Barzic's avatar Toni Barzic Committed by Chromium LUCI CQ

Clear item ids in HoldingSpaceTrayIcon::Clear

Also, clear the tray icon when hiding previews (as this cancels any
pending update timers).

BUG=None

Change-Id: I9647ff70b3359bd803a434d39b64d3cd6f1186b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2631193Reviewed-by: default avatarDavid Black <dmblack@google.com>
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843875}
parent 30f3caca
...@@ -394,8 +394,10 @@ void HoldingSpaceTray::UpdatePreviewsVisibility() { ...@@ -394,8 +394,10 @@ void HoldingSpaceTray::UpdatePreviewsVisibility() {
DCHECK(previews_tray_icon_); DCHECK(previews_tray_icon_);
previews_tray_icon_->SetVisible(show_previews); previews_tray_icon_->SetVisible(show_previews);
if (!show_previews) if (!show_previews) {
previews_tray_icon_->Clear();
previews_update_.Stop(); previews_update_.Stop();
}
} }
void HoldingSpaceTray::SchedulePreviewsIconUpdate() { void HoldingSpaceTray::SchedulePreviewsIconUpdate() {
......
...@@ -129,6 +129,7 @@ HoldingSpaceTrayIcon::~HoldingSpaceTrayIcon() = default; ...@@ -129,6 +129,7 @@ HoldingSpaceTrayIcon::~HoldingSpaceTrayIcon() = default;
void HoldingSpaceTrayIcon::Clear() { void HoldingSpaceTrayIcon::Clear() {
previews_update_weak_factory_.InvalidateWeakPtrs(); previews_update_weak_factory_.InvalidateWeakPtrs();
item_ids_.clear();
previews_by_id_.clear(); previews_by_id_.clear();
removed_previews_.clear(); removed_previews_.clear();
SetPreferredSize(CalculatePreferredSize()); SetPreferredSize(CalculatePreferredSize());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment