bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 66afc5e5 (#540276)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-03-20 16:15:08 -04:00
parent 4fb6e1ba29
commit 7a59914f97
128 changed files with 1921 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcef/browser/printing/print_dialog_linux.cc
View File

@@ -183,16 +183,16 @@ bool CefPrintDialogLinux::UpdateSettings(printing::PrintSettings* settings) {
void CefPrintDialogLinux::ShowDialog(
gfx::NativeView parent_view,
bool has_selection,
const PrintingContextLinux::PrintSettingsCallback& callback) {
PrintingContextLinux::PrintSettingsCallback callback) {
CEF_REQUIRE_UIT();
SetHandler();
if (!handler_.get()) {
callback.Run(PrintingContextLinux::CANCEL);
std::move(callback).Run(PrintingContextLinux::CANCEL);
return;
}
callback_ = callback;
callback_ = std::move(callback);
CefRefPtr<CefPrintDialogCallbackImpl> callback_impl(
new CefPrintDialogCallbackImpl(this));
@@ -310,18 +310,15 @@ void CefPrintDialogLinux::OnPrintContinue(
CefValueController::AutoLock lock_scope(impl->controller());
context_->InitWithSettings(impl->print_settings());
}
callback_.Run(PrintingContextLinux::OK);
callback_.Reset();
std::move(callback_).Run(PrintingContextLinux::OK);
}
void CefPrintDialogLinux::OnPrintCancel() {
callback_.Run(PrintingContextLinux::CANCEL);
callback_.Reset();
std::move(callback_).Run(PrintingContextLinux::CANCEL);
}
void CefPrintDialogLinux::OnJobCompleted() {
content::BrowserThread::PostTask(
content::BrowserThread::FILE, FROM_HERE,
CEF_POST_BACKGROUND_TASK(
base::Bind(base::IgnoreResult(&base::DeleteFile), path_to_pdf_, false));
// Printing finished. Matches AddRef() in PrintDocument();