Commit c5610dac authored by rbpotter's avatar rbpotter Committed by Commit Bot

Printing: Clean up print as image feature

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I9b12f216b10de1c4479fb44f25d3e3450b903169
Reviewed-on: https://chromium-review.googlesource.com/1071767Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561549}
parent 66f0b915
......@@ -2819,11 +2819,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableNupPrintingDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kNupPrinting)},
#endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_WIN) && !defined(OS_MACOSX)
{"print-pdf-as-image", flag_descriptions::kPrintPdfAsImageName,
flag_descriptions::kPrintPdfAsImageDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kPrintPdfAsImage)},
#endif
#if defined(OS_ANDROID)
{"concurrent-background-loading-on-svelte",
flag_descriptions::kOfflinePagesSvelteConcurrentLoadingName,
......
......@@ -138,8 +138,7 @@ cr.define('print_preview', function() {
* @private {boolean} rasterizeEnabled Whether the print as image feature is
* enabled.
*/
this.rasterizeEnabled_ = (!cr.isWindows && !cr.isMac) &&
loadTimeData.getBoolean('printPdfAsImageEnabled');
this.rasterizeEnabled_ = !cr.isWindows && !cr.isMac;
/**
* @private {!Array<!CheckboxTicketItemElement>} checkbox ticket item
......
......@@ -398,14 +398,6 @@ void AddPrintPreviewImages(content::WebUIDataSource* source) {
}
void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {
#if !defined(OS_MACOSX) && !defined(OS_WIN)
bool print_pdf_as_image_enabled = base::FeatureList::IsEnabled(
features::kPrintPdfAsImage);
source->AddBoolean("printPdfAsImageEnabled", print_pdf_as_image_enabled);
#else
source->AddBoolean("printPdfAsImageEnabled", false);
#endif
#if defined(OS_CHROMEOS)
source->AddBoolean("useSystemDefaultPrinter", false);
#else
......
......@@ -506,12 +506,6 @@ const base::Feature kNupPrinting{"NupPrinting",
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_WIN) && !defined(OS_MACOSX)
// Enables the Print as Image feature in print preview.
const base::Feature kPrintPdfAsImage{"PrintPdfAsImage",
base::FEATURE_ENABLED_BY_DEFAULT};
#endif
// Enables or disables push subscriptions keeping Chrome running in the
// background when closed.
const base::Feature kPushMessagingBackgroundMode{
......
......@@ -275,10 +275,6 @@ extern const base::Feature kNewPrintPreview;
extern const base::Feature kNupPrinting;
#endif
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_WIN) && !defined(OS_MACOSX)
extern const base::Feature kPrintPdfAsImage;
#endif
extern const base::Feature kPushMessagingBackgroundMode;
#if !defined(OS_ANDROID)
......
......@@ -304,9 +304,7 @@ cr.define('print_preview_test', function() {
/** @return {boolean} */
function isPrintAsImageEnabled() {
// Should be enabled by default on non Windows/Mac.
return (
!cr.isWindows && !cr.isMac &&
loadTimeData.getBoolean('printPdfAsImageEnabled'));
return !cr.isWindows && !cr.isMac;
}
const suiteName = 'PrintPreview';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment