Commit d6d671bb authored by David Black's avatar David Black Committed by Commit Bot

Fix crash due to ~AshAssistantController.

AshAssistantController needs to be cleaned up while there is still a
valid Shell instance.

Will do follow up CL to add unit tests.

Bug: 835410
Change-Id: I44edcb86e224cb6ade956db564228eb66d5bad83
Reviewed-on: https://chromium-review.googlesource.com/1022528Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: David Black <dmblack@google.com>
Cr-Commit-Position: refs/heads/master@{#552510}
parent df3689a4
...@@ -815,6 +815,7 @@ Shell::~Shell() { ...@@ -815,6 +815,7 @@ Shell::~Shell() {
// These need a valid Shell instance to clean up properly, so explicitly // These need a valid Shell instance to clean up properly, so explicitly
// delete them before invalidating the instance. // delete them before invalidating the instance.
// Alphabetical. TODO(oshima): sort. // Alphabetical. TODO(oshima): sort.
ash_assistant_controller_.reset();
magnification_controller_.reset(); magnification_controller_.reset();
tooltip_controller_.reset(); tooltip_controller_.reset();
event_client_.reset(); event_client_.reset();
......
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