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

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

Issue 2974183002: Remove bad CallJavascriptFunctionUnsafe call from PrintPreviewUI (Closed)
Patch Set: Created 3 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_ui.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 74220ae3d0da2e1ea2d6562a3a9de3cb81d7bdd0..bc7405f9789addb7f2fd0242701459ebd7c0faa6 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -536,10 +536,12 @@ void PrintPreviewUI::OnInitiatorClosed() {
WebContents* preview_dialog = web_ui()->GetWebContents();
printing::BackgroundPrintingManager* background_printing_manager =
g_browser_process->background_printing_manager();
- if (background_printing_manager->HasPrintPreviewDialog(preview_dialog))
- web_ui()->CallJavascriptFunctionUnsafe("cancelPendingPrintRequest");
- else
+ if (background_printing_manager->HasPrintPreviewDialog(preview_dialog)) {
+ background_printing_manager->OnPrintRequestCancelled(preview_dialog);
+ handler_->HandleCancelPendingPrintRequest(nullptr);
+ } else {
OnClosePrintPreviewDialog();
+ }
}
void PrintPreviewUI::OnPrintPreviewCancelled() {

Powered by Google App Engine
This is Rietveld 408576698