[printing] Convert PrintHostMsg_ShowScriptedPrintPreview to Mojo

This CL converts PrintHostMsg_ShowScriptedPrintPreview message
to ShowScriptedPrintPreview() in mojom::PrintManagerHost.

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

chrome/browser/printing/print_view_manager.cc

@@ -295,13 +295,13 @@ void PrintViewManager::OnSetupScriptedPrintPreview(
   }
 }
 
-void PrintViewManager::OnShowScriptedPrintPreview(content::RenderFrameHost* rfh,
-                                                  bool source_is_modifiable) {
+void PrintViewManager::ShowScriptedPrintPreview(bool source_is_modifiable) {
   if (print_preview_state_ != SCRIPTED_PREVIEW)
     return;
 
   DCHECK(print_preview_rfh_);
-  if (rfh != print_preview_rfh_)
+  if (print_manager_host_receivers_.GetCurrentTargetFrame() !=
+      print_preview_rfh_)
     return;
 
   PrintPreviewDialogController* dialog_controller =
@@ -337,8 +337,6 @@ bool PrintViewManager::OnMessageReceived(
     IPC_MESSAGE_FORWARD_DELAY_REPLY(
         PrintHostMsg_SetupScriptedPrintPreview, &helper,
         FrameDispatchHelper::OnSetupScriptedPrintPreview)
-    IPC_MESSAGE_HANDLER(PrintHostMsg_ShowScriptedPrintPreview,
-                        OnShowScriptedPrintPreview)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 

chrome/browser/printing/print_view_manager.h

@@ -64,6 +64,7 @@ class PrintViewManager : public PrintViewManagerBase,
 
   // mojom::PrintManagerHost:
   void DidShowPrintDialog() override;
+  void ShowScriptedPrintPreview(bool source_is_modifiable) override;
 
   // content::WebContentsObserver implementation.
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
@@ -100,8 +101,6 @@ class PrintViewManager : public PrintViewManagerBase,
   // IPC Message handlers.
   void OnSetupScriptedPrintPreview(content::RenderFrameHost* rfh,
                                    IPC::Message* reply_msg);
-  void OnShowScriptedPrintPreview(content::RenderFrameHost* rfh,
-                                  bool source_is_modifiable);
   void OnScriptedPrintPreviewReply(IPC::Message* reply_msg);
 
   void MaybeUnblockScriptedPreviewRPH();

chrome/browser/printing/print_view_manager_base.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/print_view_manager_common.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/profiles/profile.h"
@@ -64,6 +63,7 @@
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/print_error_dialog.h"
+#include "chrome/browser/printing/print_view_manager.h"
 #endif
 
 namespace printing {

chrome/browser/printing/printing_message_filter.cc

@@ -14,7 +14,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"

components/printing/browser/print_manager.cc

@@ -92,6 +92,10 @@ void PrintManager::PrintingFailed(int32_t cookie) {
 #endif
 }
 
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+void PrintManager::ShowScriptedPrintPreview(bool source_is_modifiable) {}
+#endif
+
 const mojo::AssociatedRemote<printing::mojom::PrintRenderFrame>&
 PrintManager::GetPrintRenderFrame(content::RenderFrameHost* rfh) {
   auto it = print_render_frames_.find(rfh);

components/printing/browser/print_manager.h

@@ -60,6 +60,9 @@ class PrintManager : public content::WebContentsObserver,
   void DidShowPrintDialog() override;
   void ShowInvalidPrinterSettingsError() override;
   void PrintingFailed(int32_t cookie) override;
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+  void ShowScriptedPrintPreview(bool source_is_modifiable) override;
+#endif
 
  protected:
   explicit PrintManager(content::WebContents* contents);

components/printing/common/print.mojom

@@ -313,4 +313,10 @@ interface PrintManagerHost {
 
   // Tells the browser printing failed.
   PrintingFailed(int32 cookie);
+
+  // Tells the browser to show the print preview, when the document is
+  // sufficiently loaded such that the renderer can determine whether it is
+  // modifiable or not.
+  [EnableIf=enable_print_preview]
+  ShowScriptedPrintPreview(bool is_modifiable);
 };

components/printing/common/print_messages.h

@@ -325,11 +325,6 @@ IPC_MESSAGE_ROUTED2(PrintHostMsg_MetafileReadyForPrinting,
 // Run a nested run loop in the renderer until print preview for
 // window.print() finishes.
 IPC_SYNC_MESSAGE_ROUTED0_0(PrintHostMsg_SetupScriptedPrintPreview)
-
-// Tell the browser to show the print preview, when the document is sufficiently
-// loaded such that the renderer can determine whether it is modifiable or not.
-IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview,
-                    bool /* is_modifiable */)
 #endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
 
 #endif  // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_

components/printing/renderer/print_render_frame_helper.cc

@@ -2381,8 +2381,8 @@ void PrintRenderFrameHelper::PrintPageInternal(const mojom::PrintParams& params,
 void PrintRenderFrameHelper::ShowScriptedPrintPreview() {
   if (is_scripted_preview_delayed_) {
     is_scripted_preview_delayed_ = false;
-    Send(new PrintHostMsg_ShowScriptedPrintPreview(
-        routing_id(), print_preview_context_.IsModifiable()));
+    GetPrintManagerHost()->ShowScriptedPrintPreview(
+        print_preview_context_.IsModifiable());
   }
 }
 
@@ -2414,8 +2414,8 @@ void PrintRenderFrameHelper::RequestPrintPreview(PrintPreviewRequestType type) {
       // Shows scripted print preview in two stages.
       // 1. PrintHostMsg_SetupScriptedPrintPreview blocks this call and JS by
       //    pumping messages here.
-      // 2. PrintHostMsg_ShowScriptedPrintPreview shows preview once the
-      //    document has been loaded.
+      // 2. ShowScriptedPrintPreview() shows preview once the document has been
+      //    loaded.
       is_scripted_preview_delayed_ = true;
       if (is_loading_ && print_preview_context_.IsPlugin()) {
         // Wait for DidStopLoading. Plugins may not know the correct

components/printing/test/print_render_frame_helper_browsertest.cc

@@ -329,8 +329,10 @@ class TestPrintManagerHost
     params->params->should_print_backgrounds = should_print_backgrounds.value();
     std::move(callback).Run(std::move(params), canceled);
   }
-
   void DidShowPrintDialog() override {}
+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
+  void ShowScriptedPrintPreview(bool source_is_modifiable) override {}
+#endif
 
   bool IsPrinted() { return is_printed_; }
   void SetExpectedPagesCount(uint32_t number_pages) {