Use applicationShouldTerminate to control whether application should quit.

browser/atom_application_delegate_mac.h

@@ -7,7 +7,4 @@
 @interface AtomApplicationDelegate : NSObject<NSApplicationDelegate> {
 }
 
-- (void)handleQuitEvent:(NSAppleEventDescriptor*)event
-         withReplyEvent:(NSAppleEventDescriptor*)replyEvent;
-
 @end

browser/atom_application_delegate_mac.mm

@@ -15,13 +15,6 @@
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification*)notify {
-  // Trap the quit message to handleQuitEvent.
-  NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
-  [em setEventHandler:self
-          andSelector:@selector(handleQuitEvent:withReplyEvent:)
-        forEventClass:kCoreEventClass
-           andEventID:kAEQuitApplication];
-
   atom::Browser::Get()->DidFinishLaunching();
 }
 
@@ -31,9 +24,15 @@
   return atom::Browser::Get()->OpenFile(filename_str) ? YES : NO;
 }
 
-- (void)handleQuitEvent:(NSAppleEventDescriptor*)event
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender {
-         withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
+  atom::Browser* browser = atom::Browser::Get();
-  [[AtomApplication sharedApplication] closeAllWindows:self];
+  if (browser->is_quiting()) {
+    return NSTerminateNow;
+  } else {
+    // System started termination.
+    atom::Browser::Get()->Quit();
+    return NSTerminateLater;
+  }
 }
 
 @end

browser/browser.cc

@@ -24,11 +24,12 @@ Browser* Browser::Get() {
 }
 
 void Browser::Quit() {
+  is_quiting_ = true;
+
   atom::WindowList* window_list = atom::WindowList::GetInstance();
   if (window_list->size() == 0)
     NotifyAndTerminate();
 
-  is_quiting_ = true;
   window_list->CloseAllWindows();
 }
 
@@ -53,16 +54,22 @@ void Browser::NotifyAndTerminate() {
   bool prevent_default = false;
   FOR_EACH_OBSERVER(BrowserObserver, observers_, OnWillQuit(&prevent_default));
 
-  if (prevent_default)
+  if (prevent_default) {
+    is_quiting_ = false;
     return;
+  }
 
   Terminate();
 }
 
 void Browser::OnWindowCloseCancelled(NativeWindow* window) {
-  // Once a beforeunload handler has prevented the closing, we think the quit
+  if (is_quiting_) {
-  // is cancelled too.
+    // Once a beforeunload handler has prevented the closing, we think the quit
-  is_quiting_ = false;
+    // is cancelled too.
+    is_quiting_ = false;
+
+    CancelQuit();
+  }
 }
 
 void Browser::OnWindowAllClosed() {

browser/browser.h

@@ -48,9 +48,15 @@ class Browser : public WindowListObserver {
     observers_.RemoveObserver(obs);
   }
 
+  bool is_quiting() const { return is_quiting_; }
+
  protected:
+  // Send the will-quit message and then terminate the application.
   void NotifyAndTerminate();
 
+  // Tell the system we have cancelled quiting.
+  void CancelQuit();
+
   bool is_quiting_;
 
  private:

browser/browser_mac.mm

@@ -11,11 +11,12 @@
 namespace atom {
 
 void Browser::Terminate() {
+  is_quiting_ = true;
   [[AtomApplication sharedApplication] terminate:nil];
 }
 
 void Browser::Focus() {
-  [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
+  [[AtomApplication sharedApplication] activateIgnoringOtherApps:YES];
 }
 
 std::string Browser::GetVersion() {
@@ -24,4 +25,8 @@ std::string Browser::GetVersion() {
   return base::SysNSStringToUTF8(version);
 }
 
+void Browser::CancelQuit() {
+  [[AtomApplication sharedApplication] replyToApplicationShouldTerminate:NO];
+}
+
 }  // namespace atom