Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1568)

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Issue 410473002: Assertion removed in print_preview_pdf_generated.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Assert to check validity of |PrintPreviewObserver::pdf_file_save_path_| moved. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 86ee312de2523d6cdec431d45fdeac0d8f56af72..8f35b4bf9a506bb5182ff63816d7274b29b14523 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -278,11 +278,14 @@ void ReportPrintSettingsStats(const base::DictionaryValue& settings) {
// Callback that stores a PDF file on disk.
void PrintToPdfCallback(printing::Metafile* metafile,
- const base::FilePath& path) {
+ const base::FilePath& path,
+ const base::Closure& pdf_file_saved_closure) {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
metafile->SaveTo(path);
// |metafile| must be deleted on the UI thread.
BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, metafile);
+ if (!pdf_file_saved_closure.is_null())
+ pdf_file_saved_closure.Run();
}
std::string GetDefaultPrinterOnFileThread() {
@@ -1372,7 +1375,10 @@ void PrintPreviewHandler::PostPrintToPdfTask() {
metafile->InitFromData(static_cast<const void*>(data->front()), data->size());
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- base::Bind(&PrintToPdfCallback, metafile.release(), print_to_pdf_path_));
+ base::Bind(&PrintToPdfCallback,
+ metafile.release(),
+ print_to_pdf_path_,
+ pdf_file_saved_closure_));
print_to_pdf_path_ = base::FilePath();
ClosePreviewDialog();
}
@@ -1631,3 +1637,8 @@ void PrintPreviewHandler::UnregisterForMergeSession() {
if (reconcilor_)
reconcilor_->RemoveMergeSessionObserver(this);
}
+
+void PrintPreviewHandler::SetPdfSavedClosureForTesting(
+ const base::Closure& closure) {
+ pdf_file_saved_closure_ = closure;
+}

Powered by Google App Engine
This is Rietveld 408576698