Add a 'quit' parameter to 'close' event cb

rogerwang · rogerwang · commit e342d2c6af37 · 2013-12-27T20:54:12.000+08:00
On OSX, when user hit 'Cmd-Q', the close event is sent with a 'quit' parameter to distinguish with other cases for closing window Fix nwjs#430
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -133,15 +133,15 @@ void App::Call(Shell* shell,
 }
 
 // static
-void App::CloseAllWindows(bool force) {
+void App::CloseAllWindows(bool force, bool quit) {
   std::vector<Shell*> windows = Shell::windows();
 
   for (size_t i = 0; i < windows.size(); ++i) {
     // Only send close event to browser windows, since devtools windows will
     // be automatically closed.
     if (!windows[i]->is_devtools()) {
       // If there is no js object bound to the window, then just close.
-      if (force || windows[i]->ShouldCloseWindow())
+      if (force || windows[i]->ShouldCloseWindow(quit))
         // we used to delete the Shell object here
         // but it should be deleted on native window destruction
         windows[i]->window()->Close();
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -47,7 +47,7 @@ class App {
                    base::ListValue* result);
 
   // Try to close all windows (then will cause whole app to quit).
-  static void CloseAllWindows(bool force = false);
+  static void CloseAllWindows(bool force = false, bool quit = false);
 
   // Quit the whole app.
   static void Quit(content::RenderProcessHost* rph = NULL);
diff --git a/src/browser/native_window_mac.mm b/src/browser/native_window_mac.mm
@@ -235,7 +235,7 @@ @interface ShellNSWindow : ChromeEventProcessingWindow {
 }
 - (void)setShell:(const base::WeakPtr<content::Shell>&)shell;
 - (void)showDevTools:(id)sender;
-- (void)closeAllWindows:(id)sender;
+- (void)closeAllWindowsQuit:(id)sender;
 @end
 
 @implementation ShellNSWindow
@@ -249,8 +249,8 @@ - (void)showDevTools:(id)sender {
     shell_->ShowDevTools();
 }
 
-- (void)closeAllWindows:(id)sender {
-  nwapi::App::CloseAllWindows();
+- (void)closeAllWindowsQuit:(id)sender {
+  nwapi::App::CloseAllWindows(false, true);
 }
 
 - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen
diff --git a/src/browser/standard_menus_mac.mm b/src/browser/standard_menus_mac.mm
@@ -71,7 +71,7 @@ - (void)setAppleMenu:(NSMenu *)menu;
   [appleMenu addItem:[NSMenuItem separatorItem]];
 
   [appleMenu addItemWithTitle:l10n_util::GetNSStringFWithFixup(IDS_EXIT_MAC, name)
-                       action:@selector(closeAllWindows:)
+                       action:@selector(closeAllWindowsQuit:)
                 keyEquivalent:@"q"];
 
   // Add to menubar.
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -248,11 +248,11 @@ void Shell::SendEvent(const std::string& event, const base::ListValue& args) {
       web_contents->GetRoutingID(), id(), event, args));
 }
 
-bool Shell::ShouldCloseWindow() {
+bool Shell::ShouldCloseWindow(bool quit) {
   if (id() < 0 || force_close_)
     return true;
 
-  SendEvent("close");
+  SendEvent("close", quit ? "quit" : "");
   return false;
 }
 
diff --git a/src/nw_shell.h b/src/nw_shell.h
@@ -105,7 +105,7 @@ class Shell : public WebContentsDelegate,
   void SendEvent(const std::string& event, const base::ListValue& args);
 
   // Decide whether we should close the window.
-  bool ShouldCloseWindow();
+  bool ShouldCloseWindow(bool quit = false);
 
   virtual GURL OverrideDOMStorageOrigin(const GURL& origin);
 

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ @interface ShellNSWindow : ChromeEventProcessingWindow {`
`235`	`235`	`}`
`236`	`236`	`- (void)setShell:(const base::WeakPtr<content::Shell>&)shell;`
`237`	`237`	`- (void)showDevTools:(id)sender;`
`238`		`-- (void)closeAllWindows:(id)sender;`
	`238`	`+- (void)closeAllWindowsQuit:(id)sender;`
`239`	`239`	`@end`
`240`	`240`
`241`	`241`	`@implementation ShellNSWindow`
`@@ -249,8 +249,8 @@ - (void)showDevTools:(id)sender {`
`249`	`249`	`shell_->ShowDevTools();`
`250`	`250`	`}`
`251`	`251`
`252`		`-- (void)closeAllWindows:(id)sender {`
`253`		`- nwapi::App::CloseAllWindows();`
	`252`	`+- (void)closeAllWindowsQuit:(id)sender {`
	`253`	`+ nwapi::App::CloseAllWindows(false, true);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen *)screen`
Original file line number	Diff line number	Diff line change
`@@ -248,11 +248,11 @@ void Shell::SendEvent(const std::string& event, const base::ListValue& args) {`
`248`	`248`	`web_contents->GetRoutingID(), id(), event, args));`
`249`	`249`	`}`
`250`	`250`
`251`		`-bool Shell::ShouldCloseWindow() {`
	`251`	`+bool Shell::ShouldCloseWindow(bool quit) {`
`252`	`252`	`if (id() < 0 \|\| force_close_)`
`253`	`253`	`return true;`
`254`	`254`
`255`		`- SendEvent("close");`
	`255`	`+ SendEvent("close", quit ? "quit" : "");`
`256`	`256`	`return false;`
`257`	`257`	`}`
`258`	`258`