Commit 63f8eee6 authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Fix ShelfSpinnerController DCHECK controller is null when Killed

Second attempt to fix - see crrev.com/c/2408595

Bug: 1077722
Change-Id: Iab4baf26ce1c477bfa7d023a65e2cdbf2956911a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2452031
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814447}
parent ce81bcb0
......@@ -224,7 +224,7 @@ bool ShelfSpinnerController::RemoveSpinnerFromControllerMap(
const ash::ShelfID shelf_id(app_id);
DCHECK_EQ(it->second.controller(),
it->second.IsFinished()
it->second.IsKilled()
? nullptr
: owner_->shelf_model()->GetShelfItemDelegate(shelf_id));
app_controller_map_.erase(it);
......
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