add parameter to CalcNewWinManifest

rogerwang · rogerwang · commit 2bb2b58606be · 2021-01-19T00:20:05.000-07:00
diff --git a/src/browser/nw_extensions_browser_hooks.cc b/src/browser/nw_extensions_browser_hooks.cc
@@ -131,7 +131,7 @@ void AmendManifestList(base::DictionaryValue* manifest,
   }
 }
 
-std::unique_ptr<base::DictionaryValue> MergeManifest() {
+std::unique_ptr<base::DictionaryValue> MergeManifest(const std::string& in_manifest) {
   // Following attributes will not be inherited from package.json 
   // Keep this list consistent with documents in `Manifest Format.md`
   static std::vector<const char*> non_inherited_attrs = {
@@ -144,7 +144,8 @@ std::unique_ptr<base::DictionaryValue> MergeManifest() {
   std::unique_ptr<base::DictionaryValue> manifest;
 
   // retrieve `window` manifest set by `new-win-policy`
-  std::string manifest_str = base::UTF16ToUTF8(nw::GetCurrentNewWinManifest());
+  std::string manifest_str = in_manifest.empty() ? base::UTF16ToUTF8(nw::GetCurrentNewWinManifest())
+    : in_manifest;
   std::unique_ptr<base::Value> val(base::JSONReader::ReadDeprecated(manifest_str));
   if (val && val->is_dict()) {
     manifest.reset(static_cast<base::DictionaryValue*>(val.release()));
@@ -320,10 +321,11 @@ void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
 
 void CalcNewWinParams(content::WebContents* new_contents, void* params,
                       std::string* nw_inject_js_doc_start,
-                      std::string* nw_inject_js_doc_end) {
+                      std::string* nw_inject_js_doc_end,
+                      const std::string& in_manifest) {
   extensions::AppWindow::CreateParams ret;
   std::unique_ptr<base::Value> val;
-  std::unique_ptr<base::DictionaryValue> manifest = MergeManifest();
+  std::unique_ptr<base::DictionaryValue> manifest = MergeManifest(in_manifest);
 
   bool resizable;
   if (manifest->GetBoolean(switches::kmResizable, &resizable)) {
diff --git a/src/browser/nw_extensions_browser_hooks.h b/src/browser/nw_extensions_browser_hooks.h
@@ -38,7 +38,8 @@ void LoadNWAppAsExtensionHook(base::DictionaryValue* manifest,
 // ref in extensions/browser/app_window/app_window.cc 
 void CalcNewWinParams(content::WebContents* new_contents, void* params,
                      std::string* nw_inject_js_doc_start,
-                     std::string* nw_inject_js_doc_end);
+                      std::string* nw_inject_js_doc_end,
+                      const std::string& in_manifest);
 // ref in extensions/components/native_app_window/native_app_window_views.cc
 bool ExecuteAppCommandHook(int command_id, extensions::AppWindow* app_window);
 
diff --git a/src/nw_content.h b/src/nw_content.h
@@ -75,7 +75,8 @@ void DocumentFinishHook(blink::WebLocalFrame* frame,
  void ExtensionDispatcherCreated(extensions::Dispatcher* dispatcher);
  void CalcNewWinParams(content::WebContents* new_contents, void* params,
                        std::string* nw_inject_js_doc_start,
-                       std::string* nw_inject_js_doc_end);
+                       std::string* nw_inject_js_doc_end,
+                       const std::string& in_manifest);
  bool GetImage(Package* package, const FilePath& icon_path, gfx::Image* image);
  std::unique_ptr<base::DictionaryValue> MergeManifest();
  bool ExecuteAppCommandHook(int command_id, extensions::AppWindow* app_window);
