Commit 6dbdf88e authored by siyua's avatar siyua Committed by Commit Bot

Fix Chrome would crash when a tab is closed with migration dialog

being shown.

Bug: 897998
Change-Id: I884709065290889f494a02e06d28602f2bcee68c
Reviewed-on: https://chromium-review.googlesource.com/c/1325561Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607036}
parent e14e5850
...@@ -306,6 +306,7 @@ void LocalCardMigrationDialogView::ShowDialog() { ...@@ -306,6 +306,7 @@ void LocalCardMigrationDialogView::ShowDialog() {
} }
void LocalCardMigrationDialogView::CloseDialog() { void LocalCardMigrationDialogView::CloseDialog() {
controller_ = nullptr;
GetWidget()->Close(); GetWidget()->Close();
} }
...@@ -370,7 +371,10 @@ bool LocalCardMigrationDialogView::Cancel() { ...@@ -370,7 +371,10 @@ bool LocalCardMigrationDialogView::Cancel() {
} }
void LocalCardMigrationDialogView::WindowClosing() { void LocalCardMigrationDialogView::WindowClosing() {
controller_->OnDialogClosed(); if (controller_) {
controller_->OnDialogClosed();
controller_ = nullptr;
}
} }
// TODO(crbug/867194): Add button pressed logic for kDeleteCardButtonTag. // TODO(crbug/867194): Add button pressed logic for kDeleteCardButtonTag.
......
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