Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / extensions / extension_uninstall_dialog_cocoa.mm

diff --git a/src/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/src/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
index 35c06b8..11d5955 100644 (file)
--- a/src/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
+++ b/src/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
@@ -49,13 +49,13 @@ void ExtensionUninstallDialogCocoa::Show() {
 
   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"];
+  // Default to accept when triggered via chrome://extensions page.
+  if (triggering_extension_) {
+    [continueButton setKeyEquivalent:@""];
+    [cancelButton setKeyEquivalent:@"\r"];
+  }
 
   [alert setMessageText:base::SysUTF8ToNSString(GetHeadingText())];
   [alert setAlertStyle:NSWarningAlertStyle];