[printing] Move PrintHostMsg_RequestPrintPreview_Params to mojo

This CL moves PrintHostMsg_RequestPrintPreview_Params to mojo
and renames RequestPrintPreviewParams.

Bug: 1008939
Change-Id: Ib7cab93b3c5664942d6fdca5335931d9d013dff4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583593Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Wei Li <weili@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#835950}

chrome/browser/printing/print_preview_dialog_controller_browsertest.cc

@@ -30,6 +30,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/printing/common/print.mojom.h"
 #include "components/printing/common/print_messages.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/plugin_service.h"
@@ -73,7 +74,7 @@ class RequestPrintPreviewObserver : public WebContentsObserver {
   }
 
   void OnRequestPrintPreview(
-      const PrintHostMsg_RequestPrintPreview_Params& /* params */) {
+      const printing::mojom::RequestPrintPreviewParams& /* params */) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                   std::move(quit_closure_));
   }

chrome/browser/printing/print_preview_message_handler.cc

@@ -101,7 +101,7 @@ PrintPreviewUI* PrintPreviewMessageHandler::GetPrintPreviewUI(
 
 void PrintPreviewMessageHandler::OnRequestPrintPreview(
     content::RenderFrameHost* render_frame_host,
-    const PrintHostMsg_RequestPrintPreview_Params& params) {
+    const mojom::RequestPrintPreviewParams& params) {
   PrintViewManager* print_view_manager =
       PrintViewManager::FromWebContents(web_contents());
   if (print_view_manager->RejectPrintPreviewRequestIfRestricted(

chrome/browser/printing/print_preview_message_handler.h

@@ -15,8 +15,6 @@
 #include "content/public/browser/web_contents_user_data.h"
 #include "printing/mojom/print.mojom-forward.h"
 
-struct PrintHostMsg_RequestPrintPreview_Params;
-
 namespace base {
 class RefCountedMemory;
 }
@@ -59,9 +57,8 @@ class PrintPreviewMessageHandler
   PrintPreviewUI* GetPrintPreviewUI(int preview_ui_id);
 
   // Message handlers.
-  void OnRequestPrintPreview(
-      content::RenderFrameHost* render_frame_host,
-      const PrintHostMsg_RequestPrintPreview_Params& params);
+  void OnRequestPrintPreview(content::RenderFrameHost* render_frame_host,
+                             const mojom::RequestPrintPreviewParams& params);
   void OnDidGetDefaultPageLayout(
       const mojom::PageSizeMargins& page_layout_in_points,
       const gfx::Rect& printable_area_in_points,

chrome/browser/printing/print_view_manager.cc

@@ -320,7 +320,7 @@ void PrintViewManager::ShowScriptedPrintPreview(bool source_is_modifiable) {
     web_contents()->ExitFullscreen(true);
 
   dialog_controller->PrintPreview(web_contents());
-  PrintHostMsg_RequestPrintPreview_Params params;
+  mojom::RequestPrintPreviewParams params;
   params.is_modifiable = source_is_modifiable;
   PrintPreviewUI::SetInitialParams(
       dialog_controller->GetPrintPreviewForContents(web_contents()), params);

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

@@ -613,7 +613,7 @@ void PrintPreviewUI::AddPdfPageForNupConversion(
 // static
 void PrintPreviewUI::SetInitialParams(
     content::WebContents* print_preview_dialog,
-    const PrintHostMsg_RequestPrintPreview_Params& params) {
+    const mojom::RequestPrintPreviewParams& params) {
   if (!print_preview_dialog || !print_preview_dialog->GetWebUI())
     return;
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(

chrome/browser/ui/webui/print_preview/print_preview_ui.h

@@ -25,8 +25,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
-struct PrintHostMsg_RequestPrintPreview_Params;
-
 namespace base {
 class DictionaryValue;
 class FilePath;
@@ -126,9 +124,8 @@ class PrintPreviewUI : public ConstrainedWebDialogUI,
                             int* page_index);
 
   // Set initial settings for PrintPreviewUI.
-  static void SetInitialParams(
-      content::WebContents* print_preview_dialog,
-      const PrintHostMsg_RequestPrintPreview_Params& params);
+  static void SetInitialParams(content::WebContents* print_preview_dialog,
+                               const mojom::RequestPrintPreviewParams& params);
 
   // Determines whether to cancel a print preview request based on the request
   // and UI ids in |ids|.

components/printing/common/print.mojom

@@ -22,6 +22,17 @@ struct PreviewIds {
   int32 ui_id = -1;
 };
 
+// Parameters required to do print preview.
+[EnableIf=enable_print_preview]
+struct RequestPrintPreviewParams {
+  bool is_from_arc = false;
+  bool is_modifiable = false;
+  bool is_pdf = false;
+  bool webnode_only = false;
+  bool has_selection = false;
+  bool selection_only = false;
+};
+
 // Parameters required to print the content of an out-of-process subframe.
 struct PrintFrameContentParams {
   // Physical printable area of the page in pixels according to dpi.

components/printing/common/print_messages.cc

@@ -62,17 +62,3 @@ namespace IPC {
 #error "Failed to include header components/printing/common/print_messages.h"
 #endif
 }  // namespace IPC
-
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-PrintHostMsg_RequestPrintPreview_Params::
-    PrintHostMsg_RequestPrintPreview_Params()
-    : is_from_arc(false),
-      is_modifiable(false),
-      is_pdf(false),
-      webnode_only(false),
-      has_selection(false),
-      selection_only(false) {}
-
-PrintHostMsg_RequestPrintPreview_Params::
-    ~PrintHostMsg_RequestPrintPreview_Params() {}
-#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)

components/printing/common/print_messages.h

@@ -26,24 +26,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/ipc/geometry/gfx_param_traits.h"
 
-#ifndef INTERNAL_COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
-#define INTERNAL_COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
-
-#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-struct PrintHostMsg_RequestPrintPreview_Params {
-  PrintHostMsg_RequestPrintPreview_Params();
-  ~PrintHostMsg_RequestPrintPreview_Params();
-  bool is_from_arc;
-  bool is_modifiable;
-  bool is_pdf;
-  bool webnode_only;
-  bool has_selection;
-  bool selection_only;
-};
-#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
-
-#endif  // INTERNAL_COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_
-
 #define IPC_MESSAGE_START PrintMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(printing::mojom::PageOrientation,
@@ -145,7 +127,7 @@ IPC_STRUCT_TRAITS_BEGIN(printing::PageRange)
 IPC_STRUCT_TRAITS_END()
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_RequestPrintPreview_Params)
+IPC_STRUCT_TRAITS_BEGIN(printing::mojom::RequestPrintPreviewParams)
   IPC_STRUCT_TRAITS_MEMBER(is_from_arc)
   IPC_STRUCT_TRAITS_MEMBER(is_modifiable)
   IPC_STRUCT_TRAITS_MEMBER(is_pdf)
@@ -279,7 +261,7 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PrintHostMsg_ScriptedPrint,
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 // Asks the browser to do print preview.
 IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview,
-                    PrintHostMsg_RequestPrintPreview_Params /* params */)
+                    printing::mojom::RequestPrintPreviewParams /* params */)
 
 // Notify the browser the about the to-be-rendered print preview document.
 IPC_MESSAGE_ROUTED2(PrintHostMsg_DidStartPreview,

components/printing/renderer/print_render_frame_helper.cc

@@ -2404,7 +2404,7 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
   if (delegate_->ShouldGenerateTaggedPDF())
     snapshotter_ = render_frame()->CreateAXTreeSnapshotter();
 
-  PrintHostMsg_RequestPrintPreview_Params params;
+  mojom::RequestPrintPreviewParams params;
   params.is_from_arc = is_from_arc;
   params.is_modifiable = is_modifiable;
   params.is_pdf = is_pdf;