Make printing work better with OOPIF. (try 2)

components/printing/common/print_messages.h

Index: components/printing/common/print_messages.h
diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h
index 001f44a98a76a4b2319596daf3c39f96d9ffd112..3d1e71ae1a04abdcb9680001c86822653254a886 100644
--- a/components/printing/common/print_messages.h
+++ b/components/printing/common/print_messages.h
@@ -320,12 +320,12 @@ IPC_STRUCT_END()
 // Messages sent from the browser to the renderer.
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-// Tells the render view to initiate print preview for the entire document.
-IPC_MESSAGE_ROUTED1(PrintMsg_InitiatePrintPreview, bool /* selection_only */)
-#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
+// Tells the RenderFrame to initiate print preview for the entire document.
+IPC_MESSAGE_ROUTED1(PrintMsg_InitiatePrintPreview, bool /* has_selection */)
+#endif
 
-// Tells the render frame to initiate printing or print preview for a particular
-// node, depending on which mode the render frame is in.
+// Tells the RenderFrame to initiate printing or print preview for a particular
+// node, depending on which mode the RenderFrame is in.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintNodeUnderContextMenu)
 
 #if BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -337,36 +337,31 @@ IPC_MESSAGE_ROUTED1(PrintMsg_PrintForPrintPreview,
 #endif  // BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW)
 
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
-// Tells the render view to switch the CSS to print media type, renders every
+// Tells the RenderFrame to switch the CSS to print media type, renders every
 // requested pages and switch back the CSS to display media type.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintPages)
 
 // Like PrintMsg_PrintPages, but using the print preview document's frame/node.
 IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
-#endif  // BUILDFLAG(ENABLE_BASIC_PRINTING)
+#endif
 
-// Tells the render view that printing is done so it can clean up.
+// Tells the RenderFrame that printing is done so it can clean up.
 IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone,
                     bool /* success */)
 
-// Tells the render view whether scripted printing is blocked or not.
-IPC_MESSAGE_ROUTED1(PrintMsg_SetScriptedPrintingBlocked,
-                    bool /* blocked */)
+// Tells the RenderFrame whether printing is enabled or not.
+IPC_MESSAGE_ROUTED1(PrintMsg_SetPrintingEnabled, bool /* enabled */)
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
-// Tells the render view to switch the CSS to print media type, renders every
+// Tells the RenderFrame to switch the CSS to print media type, renders every
 // requested pages for print preview using the given |settings|. This gets
 // called multiple times as the user updates settings.
 IPC_MESSAGE_ROUTED1(PrintMsg_PrintPreview,
                     base::DictionaryValue /* settings */)
-#endif  // BUILDFLAG(ENABLE_PRINT_PREVIEW)
+#endif
 
 // Messages sent from the renderer to the browser.
 
-// Check if printing is enabled.
-IPC_SYNC_MESSAGE_ROUTED0_1(PrintHostMsg_IsPrintingEnabled,
-                           bool /* is_enabled */)
-
 // Tells the browser that the renderer is done calculating the number of
 // rendered pages according to the specified settings.
 IPC_MESSAGE_ROUTED2(PrintHostMsg_DidGetPrintedPagesCount,