fix: emit 'shutdown' outside -[NSApplication terminate:] (#24141)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · Jun 16, 2020 · 284017b · 284017b
1 parent e8e05f7
commit 284017b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/shell/browser/mac/electron_application.h b/shell/browser/mac/electron_application.h
@@ -17,6 +17,7 @@
   base::scoped_nsobject<NSUserActivity> currentActivity_;
   NSCondition* handoffLock_;
   BOOL updateReceived_;
+  BOOL userStoppedShutdown_;
   base::Callback<bool()> shouldShutdown_;
 }
 
@@ -25,6 +26,9 @@
 - (void)setShutdownHandler:(base::Callback<bool()>)handler;
 - (void)registerURLHandler;
 
+// Called when macOS itself is shutting down.
+- (void)willPowerOff:(NSNotification*)notify;
+
 // CrAppProtocol:
 - (BOOL)isHandlingSendEvent;
 

diff --git a/shell/browser/mac/electron_application.mm b/shell/browser/mac/electron_application.mm
@@ -41,9 +41,14 @@ + (AtomApplication*)sharedApplication {
   return (AtomApplication*)[super sharedApplication];
 }
 
+- (void)willPowerOff:(NSNotification*)notify {
+  userStoppedShutdown_ = shouldShutdown_ && !shouldShutdown_.Run();
+}
+
 - (void)terminate:(id)sender {
-  if (shouldShutdown_ && !shouldShutdown_.Run())
-    return;  // User will call Quit later.
+  // User will call Quit later.
+  if (userStoppedShutdown_)
+    return;
 
   // 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

diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm
@@ -48,12 +48,22 @@ - (void)setApplicationDockMenu:(electron::ElectronMenuModel*)model {
                                                  useDefaultAccelerator:NO]);
 }
 
+- (void)willPowerOff:(NSNotification*)notify {
+  [[AtomApplication sharedApplication] willPowerOff:notify];
+}
+
 - (void)applicationWillFinishLaunching:(NSNotification*)notify {
   // Don't add the "Enter Full Screen" menu item automatically.
   [[NSUserDefaults standardUserDefaults]
       setBool:NO
        forKey:@"NSFullScreenMenuItemEverywhere"];
 
+  [[[NSWorkspace sharedWorkspace] notificationCenter]
+      addObserver:self
+         selector:@selector(willPowerOff:)
+             name:NSWorkspaceWillPowerOffNotification
+           object:nil];
+
   electron::Browser::Get()->WillFinishLaunching();
 }