4 files changed, 16 insertions, 12 deletions
diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp
index 1619c1001..6813d54ee 100644
--- a/src/core/printing/print_view_manager_qt.cpp
+++ b/src/core/printing/print_view_manager_qt.cpp
@@ -349,8 +349,9 @@ void PrintViewManagerQt::OnRequestPrintPreview(
     PrintPreviewDone();
 }
 
-void PrintViewManagerQt::OnMetafileReadyForPrinting(
-    const PrintHostMsg_DidPreviewDocument_Params& params)
+void PrintViewManagerQt::OnMetafileReadyForPrinting(content::RenderFrameHost* rfh,
+                                                    const PrintHostMsg_DidPreviewDocument_Params& params,
+                                                    const PrintHostMsg_PreviewIds &ids)
 {
     StopWorker(params.document_cookie);
 
@@ -408,7 +409,9 @@ void PrintViewManagerQt::RenderProcessGone(base::TerminationStatus status)
     resetPdfState();
 }
 
-void PrintViewManagerQt::OnDidPreviewPage(const PrintHostMsg_DidPreviewPage_Params &params)
+void PrintViewManagerQt::OnDidPreviewPage(content::RenderFrameHost* rfh,
+                                          const PrintHostMsg_DidPreviewPage_Params& params,
+                                          const PrintHostMsg_PreviewIds& ids)
 {
     // just consume the message, this is just for sending 'page-preview-ready' for webui
 }
diff --git a/src/core/printing/print_view_manager_qt.h b/src/core/printing/print_view_manager_qt.h
index ae96b72af..209be8782 100644
--- a/src/core/printing/print_view_manager_qt.h
+++ b/src/core/printing/print_view_manager_qt.h
@@ -116,10 +116,14 @@ protected:
     // IPC handlers
     void OnDidShowPrintDialog();
     void OnRequestPrintPreview(const PrintHostMsg_RequestPrintPreview_Params&);
-    void OnMetafileReadyForPrinting(const PrintHostMsg_DidPreviewDocument_Params& params);
+    void OnMetafileReadyForPrinting(content::RenderFrameHost* rfh,
+                                    const PrintHostMsg_DidPreviewDocument_Params& params,
+                                    const PrintHostMsg_PreviewIds &ids);
     void OnSetupScriptedPrintPreview(content::RenderFrameHost* rfh,
                                       IPC::Message* reply_msg);
-    void OnDidPreviewPage(const PrintHostMsg_DidPreviewPage_Params& params);
+    void OnDidPreviewPage(content::RenderFrameHost* rfh,
+                          const PrintHostMsg_DidPreviewPage_Params& params,
+                          const PrintHostMsg_PreviewIds& ids);
     void OnShowScriptedPrintPreview(content::RenderFrameHost* rfh,
                                     bool source_is_modifiable);
     bool PrintToPDFInternal(const QPageLayout &, bool printInColor, bool useCustomMargins = true);
diff --git a/src/core/printing/printing_message_filter_qt.cpp b/src/core/printing/printing_message_filter_qt.cpp
index 9f37e6b94..db59a0807 100644
--- a/src/core/printing/printing_message_filter_qt.cpp
+++ b/src/core/printing/printing_message_filter_qt.cpp
@@ -229,9 +229,8 @@ void PrintingMessageFilterQt::OnUpdatePrintSettingsReply(
   }
 }
 
-void PrintingMessageFilterQt::OnCheckForCancel(int32_t preview_ui_id,
-                                             int preview_request_id,
-                                             bool* cancel) {
+void PrintingMessageFilterQt::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
+                                               bool* cancel) {
   *cancel = false;
 }
 
diff --git a/src/core/printing/printing_message_filter_qt.h b/src/core/printing/printing_message_filter_qt.h
index ca5e29f08..72e4b43b4 100644
--- a/src/core/printing/printing_message_filter_qt.h
+++ b/src/core/printing/printing_message_filter_qt.h
@@ -54,6 +54,7 @@
 #include "base/memory/shared_memory.h"
 #endif
 
+struct PrintHostMsg_PreviewIds;
 struct PrintHostMsg_ScriptedPrint_Params;
 
 namespace base {
@@ -66,7 +67,6 @@ class WebContents;
 }
 
 namespace printing {
-
 class PrintJobManager;
 class PrintQueriesQueue;
 class PrinterQuery;
@@ -116,9 +116,7 @@ class PrintingMessageFilterQt : public content::BrowserMessageFilter {
                                   IPC::Message* reply_msg);
 
   // Check to see if print preview has been cancelled.
-  void OnCheckForCancel(int32_t preview_ui_id,
-                        int preview_request_id,
-                        bool* cancel);
+  void OnCheckForCancel(const PrintHostMsg_PreviewIds& ids, bool* cancel);
 
   const int render_process_id_;