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

Unified Diff: chrome/browser/extensions/external_install_ui.cc

Issue 261713003: Don't consider shutdown acknowledgement for external extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/external_install_ui.cc
diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc
index 18321849b877eba83b28b2e7855622112b2822da..dc0abc4c292baa052c213a15bf6a57052c555db0 100644
--- a/chrome/browser/extensions/external_install_ui.cc
+++ b/chrome/browser/extensions/external_install_ui.cc
@@ -340,7 +340,13 @@ void ExternalInstallDialogDelegate::InstallUIProceed() {
void ExternalInstallDialogDelegate::InstallUIAbort(bool user_initiated) {
const Extension* extension = NULL;
- if (service_weak_.get() &&
+
+ // Uninstall the extension if the abort was user initiated (and not, e.g., the
+ // result of the window closing).
+ // Otherwise, the extension will remain installed, but unacknowledged, so it
+ // will be prompted again.
+ if (user_initiated &&
+ service_weak_.get() &&
(extension = service_weak_->GetInstalledExtension(extension_id_))) {
service_weak_->UninstallExtension(extension_id_, false, NULL);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698