Relocate enable_basic_print_dialog build flag to //printing
Move the existing enable_basic_print_dialog build flag from //chrome/common to //printing. This allows it to be used even for low-level printing build control. Bug: 1374181 Change-Id: I147870cccbe25204e0cfb3ae009dba4d7a5a042f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3950942 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Alan Screen <awscreen@chromium.org> Cr-Commit-Position: refs/heads/main@{#1058998}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
476166a6ae
commit
019ee047ca
chrome
browser
ui
common
printing
@ -93,7 +93,6 @@
|
||||
#include "chrome/browser/web_applications/web_app_id.h"
|
||||
#include "chrome/browser/web_applications/web_app_provider.h"
|
||||
#include "chrome/browser/web_applications/web_app_registrar.h"
|
||||
#include "chrome/common/buildflags.h"
|
||||
#include "chrome/common/chrome_features.h"
|
||||
#include "chrome/common/content_restriction.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
|
@ -44,7 +44,6 @@
|
||||
#include "chrome/browser/ui/webui/print_preview/print_preview_metrics.h"
|
||||
#include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
|
||||
#include "chrome/browser/ui/webui/print_preview/printer_handler.h"
|
||||
#include "chrome/common/buildflags.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "chrome/common/crash_keys.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
|
@ -19,7 +19,6 @@
|
||||
#include "base/values.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
#include "chrome/common/buildflags.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/printing/common/print.mojom.h"
|
||||
#include "content/public/browser/web_ui_message_handler.h"
|
||||
|
@ -38,7 +38,6 @@ buildflag_header("buildflags") {
|
||||
"CHROME_ROOT_STORE_POLICY_SUPPORTED=$chrome_root_store_policy_supported",
|
||||
"ENABLE_BACKGROUND_MODE=$enable_background_mode",
|
||||
"ENABLE_BACKGROUND_CONTENTS=$enable_background_contents",
|
||||
"ENABLE_BASIC_PRINT_DIALOG=$enable_basic_print_dialog",
|
||||
"ENABLE_CHROME_NOTIFICATIONS=$enable_chrome_notifications",
|
||||
"ENABLE_CLICK_TO_CALL=$enable_click_to_call",
|
||||
"ENABLE_DOWNGRADE_PROCESSING=$enable_downgrade_processing",
|
||||
|
@ -42,10 +42,6 @@ declare_args() {
|
||||
enable_background_contents = !is_android
|
||||
enable_background_mode = !is_android && !is_chromeos
|
||||
|
||||
# Enable the printing system dialog for platforms that support printing
|
||||
# and have a system dialog.
|
||||
enable_basic_print_dialog = enable_basic_printing && !is_chromeos
|
||||
|
||||
# Enables usage of notifications via Chrome's MessageCenter.
|
||||
enable_chrome_notifications = is_mac || is_win || is_linux || is_fuchsia
|
||||
|
||||
|
@ -194,7 +194,7 @@ component("printing") {
|
||||
]
|
||||
}
|
||||
|
||||
if (is_chromeos) {
|
||||
if (!enable_basic_print_dialog) {
|
||||
sources += [
|
||||
"printing_context_no_system_dialog.cc",
|
||||
"printing_context_no_system_dialog.h",
|
||||
|
@ -15,6 +15,7 @@ buildflag_header("buildflags") {
|
||||
flags = [
|
||||
"ENABLE_PRINTING=$enable_basic_printing",
|
||||
"ENABLE_PRINT_PREVIEW=$enable_print_preview",
|
||||
"ENABLE_BASIC_PRINT_DIALOG=$enable_basic_print_dialog",
|
||||
"ENABLE_TAGGED_PDF=$enable_tagged_pdf",
|
||||
"ENABLE_OOP_PRINTING=$enable_oop_printing",
|
||||
"ENABLE_PRINT_CONTENT_ANALYSIS=$enable_print_content_analysis",
|
||||
|
@ -20,6 +20,10 @@ declare_args() {
|
||||
# The is_android condition is currently redundant but left for clarity.
|
||||
enable_print_preview = enable_basic_printing && enable_pdf && !is_android
|
||||
|
||||
# Enable the printing system dialog for platforms that support printing
|
||||
# and have a system dialog.
|
||||
enable_basic_print_dialog = enable_basic_printing && !is_chromeos
|
||||
|
||||
if (use_fuzzing_engine && (is_linux || is_chromeos)) {
|
||||
# For fuzzing, just restrict to chromeos and linux.
|
||||
use_cups = true
|
||||
|
Reference in New Issue
Block a user