Improve extension uninstall flow

chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

 // Copyright (c) 2011 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_uninstall_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <string>
 
@@ skipping 31 matching lines @@
     ExtensionUninstallDialog::Delegate* delegate)
     : ExtensionUninstallDialog(profile, browser, delegate) {}
 
 ExtensionUninstallDialogCocoa::~ExtensionUninstallDialogCocoa() {}
 
 void ExtensionUninstallDialogCocoa::Show() {
   NSAlert* alert = [[[NSAlert alloc] init] autorelease];
 
   NSButton* continueButton = [alert addButtonWithTitle:l10n_util::GetNSString(
       IDS_EXTENSION_PROMPT_UNINSTALL_BUTTON)];
-  // Clear the key equivalent (currently 'Return') because cancel is the default
-  // button.
-  [continueButton setKeyEquivalent:@""];
-
   NSButton* cancelButton = [alert addButtonWithTitle:l10n_util::GetNSString(
       IDS_CANCEL)];
-  [cancelButton setKeyEquivalent:@"\r"];
+  if (triggering_extension_)
+    // Default to cancel when uninstall is triggered by API.

[Yoyo Zhou, 2014/04/18 23:07:13]

This should also say "Default to accept when triggered by user gesture"

+    [continueButton setKeyEquivalent:@""];
+    [cancelButton setKeyEquivalent:@"\r"];

[Yoyo Zhou, 2014/04/18 23:07:13]

This indentation level looks like a mistake.

[Isaac (away), 2014/04/18 23:42:44]

I believe both of these lines are needed to switch button default.

[Yoyo Zhou, 2014/04/18 23:48:05]

How about some braces?

[Isaac (away), 2014/04/18 23:54:51]

Done.  Was trying to copy style from line 63-66.

 
   [alert setMessageText:base::SysUTF8ToNSString(GetHeadingText())];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert setIcon:gfx::NSImageFromImageSkia(icon_)];
 
   if ([alert runModal] == NSAlertFirstButtonReturn)
     delegate_->ExtensionUninstallAccepted();
   else
     delegate_->ExtensionUninstallCanceled();
 }
 
 }  // namespace
 
 // static
 ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
     Profile* profile,
     Browser* browser,
     Delegate* delegate) {
   return new ExtensionUninstallDialogCocoa(profile, browser, delegate);
 }