address feedback from @jkleinsc

electron · Aug 9, 2019 · 024f022 · 024f022
1 parent afefc76
commit 024f022
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
@@ -1264,9 +1264,8 @@ Returns [`PrinterInfo[]`](structures/printer-info.md).
   * `dpi` Object (optional)
     * `horizontal` Number (optional) - The horizontal dpi.
     * `vertical` Number (optional) - The vertical dpi.
-  * `headerFooterInfo` Object (optional)
-    * `header` String - String to be printed as page header.
-    * `footer` String - String to be printed as page footer.
+  * `header` String - String to be printed as page header.
+  * `footer` String - String to be printed as page footer.
 * `callback` Function (optional)
   * `success` Boolean - Indicates success of the print call.
   * `failureReason` String - Called back if the print fails; can be `cancelled` or `failed`.

diff --git a/shell/browser/api/atom_api_web_contents.cc b/shell/browser/api/atom_api_web_contents.cc
@@ -1674,14 +1674,13 @@ void WebContents::Print(mate::Arguments* args) {
   settings.SetInteger(printing::kSettingCopies, copies);
 
   // Strings to be printed as headers and footers if requested by the user.
-  mate::Dictionary header_footer;
-  if (options.Get("headerFooterInfo", &header_footer)) {
-    settings.SetBoolean(printing::kSettingHeaderFooterEnabled, true);
+  std::string header;
+  options.Get("header", &header);
+  std::string footer;
+  options.Get("footer", &footer);
 
-    std::string header;
-    header_footer.Get("header", &header);
-    std::string footer;
-    header_footer.Get("footer", &footer);
+  if (!(header.empty() && footer.empty())) {
+    settings.SetBoolean(printing::kSettingHeaderFooterEnabled, true);
 
     settings.SetString(printing::kSettingHeaderFooterTitle, header);
     settings.SetString(printing::kSettingHeaderFooterURL, footer);