Fix: nw2 close event on remote URL

Fix nwjs/nw.js#7503
nwjs · Jun 14, 2020 · a869974 · a869974
1 parent 532fb4f
commit a869974
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -662,6 +662,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunction::Run() {
         extension() && extension()->is_nwjs_app() /* trusted_source */, window_bounds, window_profile,
         user_gesture());
   }
+  create_params.extension_id = extension_id;
   create_params.windows_key = windows_key;
   create_params.frameless = frameless;
   create_params.alpha_enabled = transparent;

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
@@ -484,6 +484,7 @@ Browser* Browser::Create(const CreateParams& params) {
 
 Browser::Browser(const CreateParams& params)
    :  nw_menu_(nullptr),
+      extension_id_(params.extension_id),
       create_params_(params),
       frameless_(params.frameless),
       alpha_enabled_(params.alpha_enabled),
@@ -722,12 +723,7 @@ Browser::~Browser() {
 }
 
 bool Browser::NWCanClose(bool user_force) {
-  WebContents* web_contents = tab_strip_model_->GetActiveWebContents();
-  if (!web_contents)
-    return true;
-  const extensions::Extension* extension =
-            extensions::ProcessManager::Get(profile_)
-                ->GetExtensionForWebContents(web_contents);
+  const extensions::Extension* extension = GetExtension();
   if (!extension)
     return true;
   //content::RenderFrameHost* rfh = web_contents->GetMainFrame();
@@ -756,6 +752,12 @@ bool Browser::NWCanClose(bool user_force) {
   return true;
 }
 
+const extensions::Extension* Browser::GetExtension() const {
+  return extensions::ExtensionRegistry::Get(profile_)
+      ->enabled_extensions()
+      .GetByID(extension_id_);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Getters & Setters
 

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
@@ -224,6 +224,7 @@ class Browser : public TabStripModelObserver,
 
     static CreateParams CreateForDevTools(Profile* profile);
 
+    std::string extension_id;
     bool frameless = false;
     bool alpha_enabled = false;
     bool always_on_top = false;
@@ -311,9 +312,11 @@ class Browser : public TabStripModelObserver,
   // TODO(tbarzic): Make the constructor non-public once browser construction
   // instances are replaced with Create(). https://crbug.com/916859.
   nw::Menu* nw_menu_;
+  std::string extension_id_;
   explicit Browser(const CreateParams& params);
   ~Browser() override;
 
+  const extensions::Extension* GetExtension() const;
   bool NWCanClose(bool user_force = false);
 
   // Set overrides for the initial window bounds and maximized state.