nw2: port App.closeAppWindows and App.quit

rogerwang · rogerwang · commit ec57981360d5 · 2019-01-10T01:24:30.000-07:00
Ref nwjs#5875
diff --git a/src/api/nw_app_api.cc b/src/api/nw_app_api.cc
@@ -1,5 +1,9 @@
 #include "content/nw/src/api/nw_app_api.h"
 
+#include "chrome/browser/lifetime/browser_close_manager.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
+#include "content/public/common/content_features.h"
+
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/task/post_task.h"
@@ -50,19 +54,31 @@ NwAppQuitFunction::NwAppQuitFunction() {
 NwAppQuitFunction::~NwAppQuitFunction() {
 }
 
+void NwAppQuitFunction::DoJob(ExtensionService* service, std::string extension_id) {
+  if (base::FeatureList::IsEnabled(::features::kNWNewWin)) {
+    chrome::CloseAllBrowsersAndQuit(true);
+    return;
+  }
+  base::MessageLoop::current()->task_runner()->PostTask(
+                                                        FROM_HERE,
+                                                        base::Bind(&ExtensionService::TerminateExtension,
+                                                                   service->AsWeakPtr(),
+                                                                   extension_id));
+}
+
 ExtensionFunction::ResponseAction
 NwAppQuitFunction::Run() {
-  ExtensionService* service =
-    ExtensionSystem::Get(browser_context())->extension_service();
+  ExtensionService* service = ExtensionSystem::Get(browser_context())->extension_service();
   base::MessageLoop::current()->task_runner()->PostTask(
-        FROM_HERE,
-        base::Bind(&ExtensionService::TerminateExtension,
-                   service->AsWeakPtr(),
-                   extension_id()));
+                                                          FROM_HERE,
+                                                          base::Bind(&NwAppQuitFunction::DoJob, service, extension()->id()));
   return RespondNow(NoArguments());
 }
 
 void NwAppCloseAllWindowsFunction::DoJob(AppWindowRegistry* registry, std::string id) {
+  if (base::FeatureList::IsEnabled(::features::kNWNewWin)) {
+    chrome::CloseAllBrowsers();
+  }
   AppWindowRegistry::AppWindowList windows =
     registry->GetAppWindowsForApp(id);
 
diff --git a/src/api/nw_app_api.h b/src/api/nw_app_api.h
@@ -9,11 +9,13 @@
 
 namespace extensions {
 class AppWindowRegistry;
+class ExtensionService;
 
 class NwAppQuitFunction : public UIThreadExtensionFunction {
  public:
   NwAppQuitFunction();
 
+  static void DoJob(extensions::ExtensionService* service, std::string extension_id);
  protected:
   ~NwAppQuitFunction() override;
 
