diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 22:37:43 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 22:37:43 +0000 |
| commit | 569c5fe15cd205eeecadb95216d8a86d73c8519e (patch) | |
| tree | 61c24368be7c72ace6a10b8abcacb713ac9613db /chrome | |
| parent | 50c618049b8f27825e9439f48abec235cb86d16e (diff) | |
| download | chromium_src-569c5fe15cd205eeecadb95216d8a86d73c8519e.zip chromium_src-569c5fe15cd205eeecadb95216d8a86d73c8519e.tar.gz chromium_src-569c5fe15cd205eeecadb95216d8a86d73c8519e.tar.bz2 | |
Fix extension canceling; the CFUserNotification functionality gets a bit weird.
BUG=http://crbug.com/23405
TEST=try to cancel extension load; it should work.
Review URL: http://codereview.chromium.org/279006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index b9de60a..5bffde4 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -154,7 +154,7 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate, l10n_util::GetString(IDS_EXTENSION_PROMPT_CANCEL_BUTTON))); CFOptionFlags response; - if (kCFUserNotificationAlternateResponse == CFUserNotificationDisplayAlert( + CFUserNotificationDisplayAlert( 0, kCFUserNotificationCautionAlertLevel, NULL, // TODO(port): show the install_icon instead of a default. NULL, NULL, // Sound URL, localization URL. @@ -163,7 +163,8 @@ void ExtensionInstallUI::ConfirmInstall(Delegate* delegate, NULL, // Default button. confirm_cancel, NULL, // Other button. - &response)) { + &response); + if (response == kCFUserNotificationAlternateResponse) { delegate->AbortInstall(); } else { delegate->ContinueInstall(); |