diff --git chrome/browser/ui/cocoa/applescript/tab_applescript.mm chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 0cd84f38c229..2f872dd3dfe2 100644 --- chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -9,7 +9,6 @@ #include "base/logging.h" #import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/cocoa/applescript/apple_event_util.h" #include "chrome/browser/ui/cocoa/applescript/error_applescript.h" @@ -25,8 +24,13 @@ #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "printing/features/features.h" #include "url/gurl.h" +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) +#include "chrome/browser/printing/print_view_manager.h" +#endif + using content::NavigationController; using content::NavigationEntry; using content::OpenURLParams; @@ -231,11 +235,15 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id, - (void)handlesPrintScriptCommand:(NSScriptCommand*)command { AppleScript::LogAppleScriptUMA(AppleScript::AppleScriptCommand::TAB_PRINT); +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) bool initiated = printing::PrintViewManager::FromWebContents(webContents_) ->PrintNow(webContents_->GetMainFrame()); if (!initiated) { AppleScript::SetError(AppleScript::errInitiatePrinting); } +#else + NOTIMPLEMENTED(); +#endif } - (void)handlesSaveScriptCommand:(NSScriptCommand*)command { diff --git chrome/common/chrome_utility_printing_messages.h chrome/common/chrome_utility_printing_messages.h index fa7702857f75..874a37146fb5 100644 --- chrome/common/chrome_utility_printing_messages.h +++ chrome/common/chrome_utility_printing_messages.h @@ -26,7 +26,6 @@ #define IPC_MESSAGE_START ChromeUtilityPrintingMsgStart // Preview and Cloud Print messages. -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_ENUM_TRAITS_MAX_VALUE(printing::PdfRenderSettings::Mode, printing::PdfRenderSettings::Mode::LAST) @@ -38,6 +37,7 @@ IPC_STRUCT_TRAITS_BEGIN(printing::PdfRenderSettings) IPC_STRUCT_TRAITS_MEMBER(mode) IPC_STRUCT_TRAITS_END() +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults) IPC_STRUCT_TRAITS_MEMBER(printer_capabilities) IPC_STRUCT_TRAITS_MEMBER(caps_mime_type) diff --git components/printing/common/print_messages.cc components/printing/common/print_messages.cc index 6767c4af66ab..c860394ba411 100644 --- components/printing/common/print_messages.cc +++ components/printing/common/print_messages.cc @@ -101,7 +101,6 @@ void PrintMsg_PrintPages_Params::Reset() { pages = std::vector(); } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) PrintHostMsg_RequestPrintPreview_Params:: PrintHostMsg_RequestPrintPreview_Params() : is_modifiable(false), @@ -123,4 +122,3 @@ PrintHostMsg_SetOptionsFromDocument_Params:: PrintHostMsg_SetOptionsFromDocument_Params:: ~PrintHostMsg_SetOptionsFromDocument_Params() { } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) diff --git components/printing/common/print_messages.h components/printing/common/print_messages.h index ed443d2a8117..a0180ec440f0 100644 --- components/printing/common/print_messages.h +++ components/printing/common/print_messages.h @@ -76,7 +76,6 @@ struct PrintMsg_PrintPages_Params { std::vector pages; }; -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) struct PrintHostMsg_RequestPrintPreview_Params { PrintHostMsg_RequestPrintPreview_Params(); ~PrintHostMsg_RequestPrintPreview_Params(); @@ -95,7 +94,6 @@ struct PrintHostMsg_SetOptionsFromDocument_Params { printing::DuplexMode duplex; printing::PageRanges page_ranges; }; -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) #endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_ @@ -180,7 +178,6 @@ IPC_STRUCT_TRAITS_BEGIN(printing::PageRange) IPC_STRUCT_TRAITS_MEMBER(to) IPC_STRUCT_TRAITS_END() -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_RequestPrintPreview_Params) IPC_STRUCT_TRAITS_MEMBER(is_modifiable) IPC_STRUCT_TRAITS_MEMBER(webnode_only) @@ -201,7 +198,6 @@ IPC_STRUCT_TRAITS_BEGIN(PrintHostMsg_SetOptionsFromDocument_Params) // Specifies page range to be printed. IPC_STRUCT_TRAITS_MEMBER(page_ranges) IPC_STRUCT_TRAITS_END() -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_STRUCT_TRAITS_BEGIN(printing::PageSizeMargins) IPC_STRUCT_TRAITS_MEMBER(content_width) @@ -221,7 +217,6 @@ IPC_STRUCT_TRAITS_BEGIN(PrintMsg_PrintPages_Params) IPC_STRUCT_TRAITS_MEMBER(pages) IPC_STRUCT_TRAITS_END() -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Parameters to describe a rendered document. IPC_STRUCT_BEGIN(PrintHostMsg_DidPreviewDocument_Params) // A shared memory handle to metafile data. @@ -272,7 +267,6 @@ IPC_STRUCT_BEGIN(PrintHostMsg_DidGetPreviewPageCount_Params) // Indicates whether the existing preview data needs to be cleared or not. IPC_STRUCT_MEMBER(bool, clear_preview_data) IPC_STRUCT_END() -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) // Parameters to describe a rendered page. IPC_STRUCT_BEGIN(PrintHostMsg_DidPrintPage_Params) @@ -315,22 +309,20 @@ IPC_STRUCT_END() // Messages sent from the browser to the renderer. -#if 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 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) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) // Tells the renderer to print the print preview tab's PDF plugin without // showing the print dialog. (This is the final step in the print preview // workflow.) IPC_MESSAGE_ROUTED1(PrintMsg_PrintForPrintPreview, base::DictionaryValue /* settings */) -#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) #if BUILDFLAG(ENABLE_BASIC_PRINTING) // Tells the RenderFrame to switch the CSS to print media type, renders every @@ -348,13 +340,13 @@ IPC_MESSAGE_ROUTED1(PrintMsg_PrintingDone, // Tells the RenderFrame whether printing is enabled or not. IPC_MESSAGE_ROUTED1(PrintMsg_SetPrintingEnabled, bool /* enabled */) -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // 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 */) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Tells the RenderFrame that print preview dialog was closed. IPC_MESSAGE_ROUTED0(PrintMsg_ClosePrintPreviewDialog) #endif @@ -414,7 +406,6 @@ IPC_MESSAGE_CONTROL3(PrintHostMsg_TempFileForPrintingWritten, int /* page count */) #endif // defined(OS_ANDROID) -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Asks the browser to do print preview. IPC_MESSAGE_ROUTED1(PrintHostMsg_RequestPrintPreview, PrintHostMsg_RequestPrintPreview_Params /* params */) @@ -448,7 +439,6 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PrintHostMsg_CheckForCancel, // The memory handle in this message is already valid in the browser process. IPC_MESSAGE_ROUTED1(PrintHostMsg_MetafileReadyForPrinting, PrintHostMsg_DidPreviewDocument_Params /* params */) -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) // This is sent when there are invalid printer settings. IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError) @@ -457,7 +447,6 @@ IPC_MESSAGE_ROUTED0(PrintHostMsg_ShowInvalidPrinterSettingsError) IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintingFailed, int /* document cookie */) -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Tell the browser print preview failed. IPC_MESSAGE_ROUTED1(PrintHostMsg_PrintPreviewFailed, int /* document cookie */) @@ -484,4 +473,3 @@ IPC_MESSAGE_ROUTED1(PrintHostMsg_ShowScriptedPrintPreview, // Notify the browser to set print presets based on source PDF document. IPC_MESSAGE_ROUTED1(PrintHostMsg_SetOptionsFromDocument, PrintHostMsg_SetOptionsFromDocument_Params /* params */) -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc index c6b03ed6ad9a..5f6545a3dee7 100644 --- components/printing/renderer/print_render_frame_helper.cc +++ components/printing/renderer/print_render_frame_helper.cc @@ -319,7 +319,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame, return plugin && plugin->SupportsPaginatedPrint(); } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Returns true if the current destination printer is PRINT_TO_PDF. bool IsPrintToPdfRequested(const base::DictionaryValue& job_settings) { bool print_to_pdf = false; @@ -341,7 +340,6 @@ bool PrintingFrameHasPageSizeStyle(blink::WebLocalFrame* frame, } return frame_has_custom_page_size_style; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINTING) // Disable scaling when either: @@ -398,7 +396,6 @@ MarginType GetMarginsForPdf(blink::WebLocalFrame* frame, } #endif -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) bool FitToPageEnabled(const base::DictionaryValue& job_settings) { bool fit_to_paper_size = false; if (!job_settings.GetBoolean(kSettingFitToPageEnabled, &fit_to_paper_size)) { @@ -440,7 +437,6 @@ blink::WebPrintScalingOption GetPrintScalingOption( } return blink::kWebPrintScalingOptionFitToPrintableArea; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) // Helper function to scale and round an integer value with a double valued // scaling. @@ -959,6 +955,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper( print_for_preview_(false), delegate_(std::move(delegate)), print_node_in_progress_(false), + force_print_preview_(false), is_loading_(false), is_scripted_preview_delayed_(false), ipc_nesting_level_(0), @@ -1020,10 +1017,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { return; if (g_is_preview_enabled) { -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) print_preview_context_.InitWithFrame(web_frame); RequestPrintPreview(PRINT_PREVIEW_SCRIPTED); -#endif } else { #if BUILDFLAG(ENABLE_BASIC_PRINTING) auto weak_this = weak_ptr_factory_.GetWeakPtr(); @@ -1055,13 +1050,11 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages) IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog) #endif // BUILDFLAG(ENABLE_BASIC_PRINTING) -#if BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_MESSAGE_HANDLER(PrintMsg_PrintForPrintPreview, OnPrintForPrintPreview) -#endif -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_MESSAGE_HANDLER(PrintMsg_InitiatePrintPreview, OnInitiatePrintPreview) IPC_MESSAGE_HANDLER(PrintMsg_PrintPreview, OnPrintPreview) IPC_MESSAGE_HANDLER(PrintMsg_PrintingDone, OnPrintingDone) +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) IPC_MESSAGE_HANDLER(PrintMsg_ClosePrintPreviewDialog, OnClosePrintPreviewDialog) #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) @@ -1121,7 +1114,6 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { } #endif // BUILDFLAG(ENABLE_BASIC_PRINTING) -#if BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::OnPrintForPrintPreview( const base::DictionaryValue& job_settings) { CHECK_LE(ipc_nesting_level_, 1); @@ -1181,7 +1173,6 @@ void PrintRenderFrameHelper::OnPrintForPrintPreview( DidFinishPrinting(FAIL_PRINT); } } -#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) && BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::GetPageSizeAndContentAreaFromPageLayout( const PageSizeMargins& page_layout_in_points, @@ -1206,7 +1197,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo( ignore_css_margins_ = (margins_type != DEFAULT_MARGINS); } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::OnPrintPreview( const base::DictionaryValue& settings) { if (ipc_nesting_level_ > 1) @@ -1398,7 +1388,7 @@ bool PrintRenderFrameHelper::CreatePreviewDocument() { return true; } -#if !defined(OS_MACOSX) && BUILDFLAG(ENABLE_PRINT_PREVIEW) +#if !defined(OS_MACOSX) bool PrintRenderFrameHelper::RenderPreviewPage( int page_number, const PrintMsg_Print_Params& print_params) { @@ -1428,7 +1418,7 @@ bool PrintRenderFrameHelper::RenderPreviewPage( } return PreviewPageRendered(page_number, draft_metafile.get()); } -#endif // !defined(OS_MACOSX) && BUILDFLAG(ENABLE_PRINT_PREVIEW) +#endif // !defined(OS_MACOSX) bool PrintRenderFrameHelper::FinalizePrintReadyDocument() { DCHECK(!is_print_ready_metafile_sent_); @@ -1457,7 +1447,6 @@ bool PrintRenderFrameHelper::FinalizePrintReadyDocument() { Send(new PrintHostMsg_MetafileReadyForPrinting(routing_id(), preview_params)); return true; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::OnPrintingDone(bool success) { if (ipc_nesting_level_ > 1) @@ -1472,7 +1461,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) { is_printing_enabled_ = enabled; } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { if (ipc_nesting_level_ > 1) return; @@ -1483,7 +1471,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { // that instead. auto plugin = delegate_->GetPdfElement(frame); if (!plugin.IsNull()) { + force_print_preview_ = true; PrintNode(plugin); + force_print_preview_ = false; return; } print_preview_context_.InitWithFrame(frame); @@ -1492,10 +1482,11 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME); } +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::OnClosePrintPreviewDialog() { print_preview_context_.source_frame()->DispatchAfterPrintEvent(); } -#endif +#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) bool PrintRenderFrameHelper::IsPrintingEnabled() const { return is_printing_enabled_; @@ -1517,11 +1508,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { print_node_in_progress_ = true; - if (g_is_preview_enabled) { -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) + if (g_is_preview_enabled || force_print_preview_) { print_preview_context_.InitWithNode(node); RequestPrintPreview(PRINT_PREVIEW_USER_INITIATED_CONTEXT_NODE); -#endif } else { #if BUILDFLAG(ENABLE_BASIC_PRINTING) // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets @@ -1611,7 +1600,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { } break; -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) case FAIL_PREVIEW: if (!is_print_ready_metafile_sent_) { if (notify_browser_of_print_failure_) { @@ -1628,7 +1616,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { cookie)); print_preview_context_.Failed(false); break; -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) } prep_frame_view_.reset(); print_pages_params_.reset(); @@ -1757,7 +1744,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, return true; } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) bool PrintRenderFrameHelper::SetOptionsFromPdfDocument( PrintHostMsg_SetOptionsFromDocument_Params* options) { blink::WebLocalFrame* source_frame = print_preview_context_.source_frame(); @@ -1864,7 +1850,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings( print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS); return false; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_BASIC_PRINTING) void PrintRenderFrameHelper::GetPrintSettingsFromUser( @@ -2023,7 +2008,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToSharedMem( return true; } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::ShowScriptedPrintPreview() { if (is_scripted_preview_delayed_) { is_scripted_preview_delayed_ = false; @@ -2158,7 +2142,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered(int page_number, Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params)); return true; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext() : total_page_count_(0), diff --git components/printing/renderer/print_render_frame_helper.h components/printing/renderer/print_render_frame_helper.h index a9fe8cb7dcaf..ea35ea3cc920 100644 --- components/printing/renderer/print_render_frame_helper.h +++ components/printing/renderer/print_render_frame_helper.h @@ -156,10 +156,8 @@ class PrintRenderFrameHelper OK, FAIL_PRINT_INIT, FAIL_PRINT, -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) FAIL_PREVIEW, INVALID_SETTINGS, -#endif }; enum PrintPreviewErrorBuckets { @@ -196,9 +194,9 @@ class PrintRenderFrameHelper void OnPrintForSystemDialog(); void OnPrintForPrintPreview(const base::DictionaryValue& job_settings); #endif // BUILDFLAG(ENABLE_BASIC_PRINTING) -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnInitiatePrintPreview(bool has_selection); void OnPrintPreview(const base::DictionaryValue& settings); +#if BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnClosePrintPreviewDialog(); #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) void OnPrintingDone(bool success); @@ -213,7 +211,6 @@ class PrintRenderFrameHelper // Update |ignore_css_margins_| based on settings. void UpdateFrameMarginsCssInfo(const base::DictionaryValue& settings); -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Prepare frame for creating preview document. void PrepareFrameForPreviewDocument(); @@ -230,7 +227,6 @@ class PrintRenderFrameHelper // Finalize the print ready preview document. bool FinalizePrintReadyDocument(); -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) // Enable/Disable printing. void OnSetPrintingEnabled(bool enabled); @@ -260,7 +256,6 @@ class PrintRenderFrameHelper const blink::WebNode& node, int* number_of_pages); -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Set options for print preset from source PDF document. bool SetOptionsFromPdfDocument( PrintHostMsg_SetOptionsFromDocument_Params* options); @@ -271,7 +266,6 @@ class PrintRenderFrameHelper bool UpdatePrintSettings(blink::WebLocalFrame* frame, const blink::WebNode& node, const base::DictionaryValue& passed_job_settings); -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_BASIC_PRINTING) // Get final print settings from the user. @@ -375,7 +369,6 @@ class PrintRenderFrameHelper bool IsScriptInitiatedPrintAllowed(blink::WebLocalFrame* frame, bool user_initiated); -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) // Shows scripted print preview when options from plugin are available. void ShowScriptedPrintPreview(); @@ -393,7 +386,6 @@ class PrintRenderFrameHelper // |metafile| is the rendered page. Otherwise |metafile| is NULL. // Returns true if print preview should continue, false on failure. bool PreviewPageRendered(int page_number, PdfMetafileSkia* metafile); -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) void SetPrintPagesParams(const PrintMsg_PrintPages_Params& settings); @@ -554,6 +546,7 @@ class PrintRenderFrameHelper ScriptingThrottler scripting_throttler_; bool print_node_in_progress_; + bool force_print_preview_; PrintPreviewContext print_preview_context_; bool is_loading_; bool is_scripted_preview_delayed_; diff --git components/printing/renderer/print_render_frame_helper_mac.mm components/printing/renderer/print_render_frame_helper_mac.mm index 42149955ee2c..ca6cb42ffce1 100644 --- components/printing/renderer/print_render_frame_helper_mac.mm +++ components/printing/renderer/print_render_frame_helper_mac.mm @@ -76,7 +76,6 @@ void PrintRenderFrameHelper::PrintPagesInternal( } } -#if BUILDFLAG(ENABLE_PRINT_PREVIEW) bool PrintRenderFrameHelper::RenderPreviewPage( int page_number, const PrintMsg_Print_Params& print_params) { @@ -115,7 +114,6 @@ bool PrintRenderFrameHelper::RenderPreviewPage( } return PreviewPageRendered(page_number, draft_metafile.get()); } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) void PrintRenderFrameHelper::RenderPage(const PrintMsg_Print_Params& params, int page_number,