[printing] Move PrintHostMsg_ScriptedPrint_Params to print.mojom

This CL moves PrintHostMsg_ScriptedPrint_Params to print.mojom
to pass it to Mojo interfaces.

Bug: 1008939
Change-Id: Ib8f84db7fbb2881f1a0cc2c2156a45f9ee88b946
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345784Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#800815}

android_webview/browser/aw_print_manager.cc

@@ -92,7 +92,7 @@ void AwPrintManager::OnGetDefaultPrintSettings(
 
 void AwPrintManager::OnScriptedPrint(
     content::RenderFrameHost* render_frame_host,
-    const PrintHostMsg_ScriptedPrint_Params& scripted_params,
+    const printing::mojom::ScriptedPrintParams& scripted_params,
     IPC::Message* reply_msg) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   PrintMsg_PrintPages_Params params;

android_webview/browser/aw_print_manager.h

@@ -51,7 +51,7 @@ class AwPrintManager : public printing::PrintManager,
   void OnGetDefaultPrintSettings(content::RenderFrameHost* render_frame_host,
                                  IPC::Message* reply_msg) override;
   void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
-                       const PrintHostMsg_ScriptedPrint_Params& params,
+                       const printing::mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg) override;
 
   static void OnDidPrintDocumentWritingDone(

chrome/browser/printing/print_view_manager_base.cc

@@ -376,7 +376,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
 
 void PrintViewManagerBase::OnScriptedPrint(
     content::RenderFrameHost* render_frame_host,
-    const PrintHostMsg_ScriptedPrint_Params& params,
+    const mojom::ScriptedPrintParams& params,
     IPC::Message* reply_msg) {
   NOTREACHED() << "should be handled by printing:: PrintingMessageFilter";
 }

chrome/browser/printing/print_view_manager_base.h

@@ -125,7 +125,7 @@ class PrintViewManagerBase : public content::NotificationObserver,
                                  IPC::Message* reply_msg) override;
   void OnPrintingFailed(int cookie) override;
   void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
-                       const PrintHostMsg_ScriptedPrint_Params& params,
+                       const mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg) override;
 
   void OnShowInvalidPrinterSettingsError();

chrome/browser/printing/printing_message_filter.cc

@@ -20,6 +20,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "components/printing/browser/print_manager_utils.h"
+#include "components/printing/common/print.mojom.h"
 #include "components/printing/common/print_messages.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/render_frame_host.h"
@@ -180,7 +181,7 @@ void PrintingMessageFilter::OnGetDefaultPrintSettingsReply(
 }
 
 void PrintingMessageFilter::OnScriptedPrint(
-    const PrintHostMsg_ScriptedPrint_Params& params,
+    const mojom::ScriptedPrintParams& params,
     IPC::Message* reply_msg) {
 #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
   ModuleDatabase::GetInstance()->DisableThirdPartyBlocking();

chrome/browser/printing/printing_message_filter.h

@@ -21,7 +21,6 @@
 #include "printing/buildflags/buildflags.h"
 
 struct PrintHostMsg_PreviewIds;
-struct PrintHostMsg_ScriptedPrint_Params;
 class Profile;
 
 namespace printing {
@@ -68,7 +67,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter {
   // The renderer host have to show to the user the print dialog and returns
   // the selected print settings. The task is handled by the print worker
   // thread and the UI thread. The reply occurs on the IO thread.
-  void OnScriptedPrint(const PrintHostMsg_ScriptedPrint_Params& params,
+  void OnScriptedPrint(const mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg);
   void OnScriptedPrintReply(std::unique_ptr<PrinterQuery> printer_query,
                             IPC::Message* reply_msg);

components/printing/browser/print_manager.cc

@@ -22,7 +22,7 @@ struct PrintManager::FrameDispatchHelper {
     manager->OnGetDefaultPrintSettings(render_frame_host, reply_msg);
   }
 
-  void OnScriptedPrint(const PrintHostMsg_ScriptedPrint_Params& scripted_params,
+  void OnScriptedPrint(const mojom::ScriptedPrintParams& scripted_params,
                        IPC::Message* reply_msg) {
     manager->OnScriptedPrint(render_frame_host, scripted_params, reply_msg);
   }

components/printing/browser/print_manager.h

@@ -22,8 +22,6 @@ namespace IPC {
 class Message;
 }
 
-struct PrintHostMsg_ScriptedPrint_Params;
-
 namespace printing {
 
 class PrintManager : public content::WebContentsObserver,
@@ -101,7 +99,7 @@ class PrintManager : public content::WebContentsObserver,
       IPC::Message* reply_msg) = 0;
   virtual void OnPrintingFailed(int cookie);
   virtual void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
-                               const PrintHostMsg_ScriptedPrint_Params& params,
+                               const mojom::ScriptedPrintParams& params,
                                IPC::Message* reply_msg) = 0;
 
   int number_pages_ = 0;  // Number of pages to print in the print job.

components/printing/common/print.mojom

@@ -153,6 +153,18 @@ struct DidPrintDocumentParams {
   gfx.mojom.Point physical_offsets;
 };
 
+// TODO(dgn): Rename *ScriptedPrint messages because they are not called only
+//           from scripts.
+// Parameters to get a print setting from a user before printing.
+struct ScriptedPrintParams {
+  int32 cookie;
+  int32 expected_pages_count;
+  bool has_selection;
+  bool is_scripted;
+  bool is_modifiable;
+  MarginType margin_type;
+};
+
 // Interface implemented by a class that desires to render print documents for
 // Chrome print preview.
 interface PrintRenderer {

components/printing/common/print_messages.h

@@ -275,18 +275,17 @@ IPC_STRUCT_TRAITS_BEGIN(printing::mojom::DidPrintDocumentParams)
   IPC_STRUCT_TRAITS_MEMBER(physical_offsets)
 IPC_STRUCT_TRAITS_END()
 
-// TODO(dgn) Rename *ScriptedPrint messages because they are not called only
+// TODO(dgn): Rename *ScriptedPrint messages because they are not called only
 //           from scripts.
-// Parameters for the IPC message ViewHostMsg_ScriptedPrint
-IPC_STRUCT_BEGIN(PrintHostMsg_ScriptedPrint_Params)
-  IPC_STRUCT_MEMBER(int, cookie)
-  IPC_STRUCT_MEMBER(int, expected_pages_count)
-  IPC_STRUCT_MEMBER(bool, has_selection)
-  IPC_STRUCT_MEMBER(bool, is_scripted)
-  IPC_STRUCT_MEMBER(bool, is_modifiable)
-  IPC_STRUCT_MEMBER(printing::mojom::MarginType, margin_type)
-IPC_STRUCT_END()
-
+// Parameters for the IPC message PrintHostMsg_ScriptedPrint
+IPC_STRUCT_TRAITS_BEGIN(printing::mojom::ScriptedPrintParams)
+  IPC_STRUCT_TRAITS_MEMBER(cookie)
+  IPC_STRUCT_TRAITS_MEMBER(expected_pages_count)
+  IPC_STRUCT_TRAITS_MEMBER(has_selection)
+  IPC_STRUCT_TRAITS_MEMBER(is_scripted)
+  IPC_STRUCT_TRAITS_MEMBER(is_modifiable)
+  IPC_STRUCT_TRAITS_MEMBER(margin_type)
+IPC_STRUCT_TRAITS_END()
 
 // Messages sent from the renderer to the browser.
 
@@ -327,7 +326,7 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PrintHostMsg_UpdatePrintSettings,
 // final print settings. The output parameter is the same as
 // PrintMsg_PrintPages which is executed implicitly.
 IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_ScriptedPrint,
-                           PrintHostMsg_ScriptedPrint_Params,
+                           printing::mojom::ScriptedPrintParams,
                            PrintMsg_PrintPages_Params
                            /* settings chosen by the user*/)
 

components/printing/renderer/print_render_frame_helper.cc

@@ -2259,7 +2259,7 @@ void PrintRenderFrameHelper::GetPrintSettingsFromUser(
   bool is_scripted = print_request_type == PrintRequestType::kScripted;
   DCHECK(is_scripted || print_request_type == PrintRequestType::kRegular);
 
-  PrintHostMsg_ScriptedPrint_Params params;
+  mojom::ScriptedPrintParams params;
   params.cookie = print_pages_params_->params.document_cookie;
   params.has_selection = frame->HasSelection();
   params.expected_pages_count = expected_pages_count;

components/printing/test/print_mock_render_thread.cc

@@ -78,7 +78,7 @@ void PrintMockRenderThread::OnGetDefaultPrintSettings(
 }
 
 void PrintMockRenderThread::OnScriptedPrint(
-    const PrintHostMsg_ScriptedPrint_Params& params,
+    const printing::mojom::ScriptedPrintParams& params,
     PrintMsg_PrintPages_Params* settings) {
   if (print_dialog_user_response_) {
     printer_->ScriptedPrint(params.cookie, params.expected_pages_count,

components/printing/test/print_mock_render_thread.h

@@ -25,7 +25,6 @@ class DictionaryValue;
 
 class MockPrinter;
 struct PrintHostMsg_PreviewIds;
-struct PrintHostMsg_ScriptedPrint_Params;
 struct PrintMsg_PrintPages_Params;
 
 // Extends content::MockRenderThread to know about printing
@@ -74,7 +73,7 @@ class PrintMockRenderThread : public content::MockRenderThread {
   void OnGetDefaultPrintSettings(printing::mojom::PrintParams* setting);
 
   // PrintRenderFrameHelper expects final print settings from the user.
-  void OnScriptedPrint(const PrintHostMsg_ScriptedPrint_Params& params,
+  void OnScriptedPrint(const printing::mojom::ScriptedPrintParams& params,
                        PrintMsg_PrintPages_Params* settings);
 
   void OnDidPrintDocument(const printing::mojom::DidPrintDocumentParams& params,

headless/lib/browser/headless_print_manager.cc

@@ -234,7 +234,7 @@ void HeadlessPrintManager::OnGetDefaultPrintSettings(
 
 void HeadlessPrintManager::OnScriptedPrint(
     content::RenderFrameHost* render_frame_host,
-    const PrintHostMsg_ScriptedPrint_Params& params,
+    const printing::mojom::ScriptedPrintParams& params,
     IPC::Message* reply_msg) {
   PageRangeStatus status =
       PageRangeTextToPages(page_ranges_text_, ignore_invalid_page_ranges_,

headless/lib/browser/headless_print_manager.h

@@ -17,7 +17,6 @@
 #include "headless/public/headless_export.h"
 #include "printing/print_settings.h"
 
-struct PrintHostMsg_ScriptedPrint_Params;
 struct PrintMsg_PrintPages_Params;
 
 namespace headless {
@@ -106,7 +105,7 @@ class HeadlessPrintManager
                                  IPC::Message* reply_msg) override;
   void OnPrintingFailed(int cookie) override;
   void OnScriptedPrint(content::RenderFrameHost* render_frame_host,
-                       const PrintHostMsg_ScriptedPrint_Params& params,
+                       const printing::mojom::ScriptedPrintParams& params,
                        IPC::Message* reply_msg) override;
 
   void OnShowInvalidPrinterSettingsError();