Fix extension canceling; the CFUserNotification functionality gets a bit weir...

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 136 matching lines @@
   subst.push_back(warnings[base::RandInt(0, arraysize(warnings) - 1)]);
   subst.push_back(l10n_util::GetStringUTF16(
       IDS_EXTENSION_PROMPT_WARNING_SEVERE));
   scoped_cftyperef<CFStringRef> confirm_prompt(base::SysUTF16ToCFStringRef(
       ReplaceStringPlaceholders(confirm_format, subst, NULL)));
 
   scoped_cftyperef<CFStringRef> confirm_cancel(base::SysWideToCFStringRef(
       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.
       confirm_title,
       confirm_prompt,
       NULL, // Default button.
       confirm_cancel,
       NULL, // Other button.
-      &response)) {
+      &response);
+  if (kCFUserNotificationAlternateResponse == response) {

[Mark Mentovai, 2009/10/14 22:32:30]

We don't usually do (constant == variable), we usually write in English.  I'm
aware of why this might be better, but it's still harder to read.  LG if you
like it this way though.

     delegate->AbortInstall();
   } else {
     delegate->ContinueInstall();
   }
 #else
   // TODO(port): Implement some UI.
   NOTREACHED();
   delegate->ContinueInstall();
 #endif  // OS_*
 }
@@ skipping 60 matching lines @@
 #else
       new ThemeInstalledInfoBarDelegate(tab_contents,
                                         new_theme->name(), previous_theme_id_);
 #endif
 
   if (old_delegate)
     tab_contents->ReplaceInfoBar(old_delegate, new_delegate);
   else
     tab_contents->AddInfoBar(new_delegate);
 }