Use newer API for alert.

1 files changed, 18 insertions, 22 deletions

diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m
index 2abc5d854..8607e4ddd 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -110,34 +110,30 @@
 
 - (BOOL)windowShouldClose:(NSWindow *)window
 {
-    if ([tabView numberOfTabViewItems] <= 1)
-        return YES;
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:kAlwaysCloseMultipleTabs])
+    if (tabView.numberOfTabViewItems <= 1 || [[NSUserDefaults standardUserDefaults] boolForKey:kAlwaysCloseMultipleTabs]) {
         return YES;
+    }
 
-    NSAlert *ask = [NSAlert alertWithMessageText:NSLocalizedString(@"Do you really want to close this window?", nil)
-                                   defaultButton:NSLocalizedString(@"Yes", @"'Yes' button")
-                                 alternateButton:NSLocalizedString(@"No", @"'No' button")
-                                     otherButton:nil
-                       informativeTextWithFormat:NSLocalizedString(@"There are %d tabs open, do you want to close them all?", nil),
-                       [tabView numberOfTabViewItems]];
-    [ask setShowsSuppressionButton:YES];
+    NSAlert *ask = [[NSAlert alloc] init];
+    ask.messageText = NSLocalizedString(@"Do you really want to close this window?", nil);
+    [ask addButtonWithTitle:NSLocalizedString(@"Yes", @"'Yes' button")];
+    [ask addButtonWithTitle:NSLocalizedString(@"No", @"'No' button")];
+    ask.informativeText = [NSString localizedStringWithFormat:NSLocalizedString(@"There are %d tabs open, do you want to close them all?", nil), tabView.numberOfTabViewItems];
+    ask.showsSuppressionButton = YES;
 
     [ask beginSheetModalForWindow:window
-                    modalDelegate:self
-                   didEndSelector:@selector(canCloseAlertDidEnd:returnCode:contextInfo:)
-                      contextInfo:NULL];
+                completionHandler:^(NSModalResponse returnCode) {
+                    if (returnCode != NSAlertFirstButtonReturn) {
+                        return;
+                    }
 
-    return NO;
-}
+                    [[NSUserDefaults standardUserDefaults] setBool:[[ask suppressionButton] state] == NSOnState
+                                                            forKey:kAlwaysCloseMultipleTabs];
+                    [self.window close];
 
-- (void)canCloseAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
-{
-    if (returnCode == NSModalResponseOK) {
-        [[NSUserDefaults standardUserDefaults] setBool:[[alert suppressionButton] state] == NSOnState
-                                                forKey:kAlwaysCloseMultipleTabs];
-        [[self window] close];
-    }
+                }];
+
+    return NO;
 }
 
 - (void)windowWillClose:(NSNotification *)notification