Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3321)

Unified Diff: chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc

Issue 1070273003: Dismiss DevicePermissionsPrompt when the widgets are destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed pkasting@'s nits. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/extensions/device_permissions_dialog_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
index 773a85df6d2ef446345bc5a754e7a22e4c205da2..d3e98dd224ee7b30e1f71326e6decca4443f90e0 100644
--- a/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc
@@ -120,16 +120,17 @@ DevicePermissionsDialogView::~DevicePermissionsDialogView() {
RemoveAllChildViews(true);
}
-bool DevicePermissionsDialogView::Cancel() {
+void DevicePermissionsDialogView::DeleteDelegate() {
+ // Calling prompt_->Dismissed() here ensures it will be called regardless of
+ // how the view is closed, including shutdown of the entire view hierarchy.
prompt_->Dismissed();
- return true;
+ delete this;
}
bool DevicePermissionsDialogView::Accept() {
for (int index : table_view_->selection_model().selected_indices()) {
prompt_->GrantDevicePermission(index);
}
- prompt_->Dismissed();
return true;
}
« no previous file with comments | « chrome/browser/ui/views/extensions/device_permissions_dialog_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698