The tryToTerminateApp is not really needed

This commit is contained in:
Cheng Zhao 2018-02-05 16:25:50 +09:00
Родитель 983e1b1a70
Коммит 9337959f51
3 изменённых файлов: 5 добавлений и 11 удалений

Просмотреть файл

@ -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<bool()>)handler {

Просмотреть файл

@ -11,8 +11,6 @@
base::scoped_nsobject<AtomMenuController> menu_controller_;
}
- (void)tryToTerminateApp:(NSApplication*)app;
// Sets the menu that will be returned in "applicationDockMenu:".
- (void)setApplicationDockMenu:(atom::AtomMenuModel*)model;

Просмотреть файл

@ -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();