diff --git a/atom/browser/mac/atom_application.mm b/atom/browser/mac/atom_application.mm index 68daa8c8b2..a7ea338857 100644 --- a/atom/browser/mac/atom_application.mm +++ b/atom/browser/mac/atom_application.mm @@ -31,8 +31,11 @@ inline void dispatch_sync_main(dispatch_block_t block) { - (void)terminate:(id)sender { if (shouldShutdown_ && !shouldShutdown_.Run()) return; // User will call Quit later. - AtomApplicationDelegate* atomDelegate = (AtomApplicationDelegate*) [NSApp delegate]; - [atomDelegate tryToTerminateApp:self]; + + // We simply try to close the browser, which in turn will try to close the + // windows. Termination can proceed if all windows are closed or window close + // can be cancelled which will abort termination. + atom::Browser::Get()->Quit(); } - (void)setShutdownHandler:(base::Callback)handler { diff --git a/atom/browser/mac/atom_application_delegate.h b/atom/browser/mac/atom_application_delegate.h index cbc5c71d0a..777475213e 100644 --- a/atom/browser/mac/atom_application_delegate.h +++ b/atom/browser/mac/atom_application_delegate.h @@ -11,8 +11,6 @@ base::scoped_nsobject menu_controller_; } -- (void)tryToTerminateApp:(NSApplication*)app; - // Sets the menu that will be returned in "applicationDockMenu:". - (void)setApplicationDockMenu:(atom::AtomMenuModel*)model; diff --git a/atom/browser/mac/atom_application_delegate.mm b/atom/browser/mac/atom_application_delegate.mm index 5664501d1a..e210ad2b6a 100644 --- a/atom/browser/mac/atom_application_delegate.mm +++ b/atom/browser/mac/atom_application_delegate.mm @@ -87,13 +87,6 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; return atom::Browser::Get()->OpenFile(filename_str) ? YES : NO; } -// We simply try to close the browser, which in turn will try to close the windows. -// Termination can proceed if all windows are closed or window close can be cancelled -// which will abort termination. -- (void)tryToTerminateApp:(NSApplication*)app { - atom::Browser::Get()->Quit(); -} - - (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication hasVisibleWindows:(BOOL)flag { atom::Browser* browser = atom::Browser::Get();