mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add a callback option to webContents.print

Browse source
This commit is contained in:
renaesop 2017-07-21 15:16:27 +08:00
parent 3283238555
commit 6d16eb81d2
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
atom/browser/api/atom_api_web_contents.cc
View file

@ -1269,13 +1269,21 @@ bool WebContents::IsAudioMuted() {
void WebContents::Print(mate::Arguments* args) { void WebContents::Print(mate::Arguments* args) {
PrintSettings settings = { false, false, base::string16() }; PrintSettings settings = { false, false, base::string16() };
if (args->Length() == 1 && !args->GetNext(&settings)) { if (args->Length() >= 1 && !args->GetNext(&settings)) {
args->ThrowError(); args->ThrowError();
return; return;
} }
auto print_view_manager_basic_ptr =
printing::PrintViewManagerBasic::FromWebContents(web_contents())-> printing::PrintViewManagerBasic::FromWebContents(web_contents());
PrintNow(web_contents()->GetMainFrame(), if (args->Length() == 2) {
base::Callback<void(bool)> callback;
if (!args->GetNext(&callback)) {
args->ThrowError();
return;
}
print_view_manager_basic_ptr->SetCallback(callback);
}
print_view_manager_basic_ptr->PrintNow(web_contents()->GetMainFrame(),
settings.silent, settings.silent,
settings.print_background, settings.print_background,
settings.device_name); settings.device_name);

9
chromium_src/chrome/browser/printing/print_view_manager_base.cc
View file

@ -377,9 +377,12 @@ void PrintViewManagerBase::DisconnectFromCurrentPrintJob() {
} }
void PrintViewManagerBase::PrintingDone(bool success) { void PrintViewManagerBase::PrintingDone(bool success) {
if (!print_job_.get()) if (print_job_.get()) {
return; Send(new PrintMsg_PrintingDone(routing_id(), success));
Send(new PrintMsg_PrintingDone(routing_id(), success)); }
if (!callback.is_null()) {
callback.Run(success && print_job_);
}
} }
void PrintViewManagerBase::TerminatePrintJob(bool cancel) { void PrintViewManagerBase::TerminatePrintJob(bool cancel) {

9
chromium_src/chrome/browser/printing/print_view_manager_base.h
View file

@ -5,6 +5,9 @@
#ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_ #ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_
#define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_BASE_H_
#include <memory>
#include "base/callback.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "components/prefs/pref_member.h" #include "components/prefs/pref_member.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
@ -47,6 +50,10 @@ class PrintViewManagerBase : public content::NotificationObserver,
// PrintedPagesSource implementation. // PrintedPagesSource implementation.
virtual base::string16 RenderSourceName() override; virtual base::string16 RenderSourceName() override;
void SetCallback(const base::Callback<void(bool)>& cb) {
callback = cb;
};
protected: protected:
explicit PrintViewManagerBase(content::WebContents* web_contents); explicit PrintViewManagerBase(content::WebContents* web_contents);
@ -159,6 +166,8 @@ class PrintViewManagerBase : public content::NotificationObserver,
scoped_refptr<printing::PrintQueriesQueue> queue_; scoped_refptr<printing::PrintQueriesQueue> queue_;
base::Callback<void(bool)> callback;
DISALLOW_COPY_AND_ASSIGN(PrintViewManagerBase); DISALLOW_COPY_AND_ASSIGN(PrintViewManagerBase);
}; };

4
docs/api/web-contents.md
View file

@ -950,13 +950,15 @@ Get the system printer list.
Returns [`PrinterInfo[]`](structures/printer-info.md) Returns [`PrinterInfo[]`](structures/printer-info.md)
#### `contents.print([options])` #### `contents.print([options], [callback])`
* `options` Object (optional) * `options` Object (optional)
* `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`. * `silent` Boolean (optional) - Don't ask user for print settings. Default is `false`.
* `printBackground` Boolean (optional) - Also prints the background color and image of * `printBackground` Boolean (optional) - Also prints the background color and image of
the web page. Default is `false`. the web page. Default is `false`.
* `deviceName` String (optional) - Set the printer device name to use. Default is `''`. * `deviceName` String (optional) - Set the printer device name to use. Default is `''`.
* `callback` Function (optional)
* success` Boolean - Indicates success of the print call.
Prints window's web page. When `silent` is set to `true`, Electron will pick Prints window's web page. When `silent` is set to `true`, Electron will pick
the system's default printer if `deviceName` is empty and the default settings the system's default printer if `deviceName` is empty and the default settings