From 318a55fc28aa04351073f5e08fbd6c1fd6b05ae5 Mon Sep 17 00:00:00 2001 From: Scott Violet Date: Fri, 30 Mar 2018 19:08:19 +0000 Subject: [PATCH] Rename buildflag_headers for consistency This updates printing. Targets go from foo_features to foo_buildflags And similarly the header now has buildflags in the name. BUG=814485 TEST=covered by build Change-Id: I455c5638ef9bcd98f669fc7117b4699a34292fd0 Reviewed-on: https://chromium-review.googlesource.com/988132 Reviewed-by: Daniel Cheng Commit-Queue: Scott Violet Cr-Commit-Position: refs/heads/master@{#547228} --- chrome/BUILD.gn | 2 +- chrome/app/BUILD.gn | 6 +++--- chrome/app/chrome_main_delegate.cc | 2 +- chrome/browser/BUILD.gn | 4 ++-- chrome/browser/about_flags.cc | 2 +- chrome/browser/apps/app_browsertest.cc | 2 +- chrome/browser/browser_process_impl.cc | 2 +- chrome/browser/browser_process_impl.h | 2 +- chrome/browser/browser_shutdown.cc | 2 +- chrome/browser/chrome_browser_main.cc | 2 +- chrome/browser/chrome_content_browser_client.cc | 2 +- chrome/browser/chromeos/BUILD.gn | 2 +- chrome/browser/extensions/BUILD.gn | 2 +- .../browser/extensions/api/chrome_extensions_api_client.cc | 2 +- .../api/cloud_print_private/cloud_print_private_api.cc | 2 +- .../api/cloud_print_private/cloud_print_private_api.h | 2 +- .../extensions/component_extensions_whitelist/whitelist.cc | 2 +- chrome/browser/extensions/component_loader.cc | 2 +- chrome/browser/metrics/chrome_metrics_service_client.cc | 2 +- chrome/browser/prefs/browser_prefs.cc | 2 +- .../printing/cloud_print/cloud_print_proxy_service.h | 2 +- .../cloud_print/cloud_print_proxy_service_factory.h | 2 +- chrome/browser/printing/cloud_print/privet_http_impl.cc | 2 +- chrome/browser/printing/cloud_print/privet_http_impl.h | 2 +- chrome/browser/printing/cloud_print/privet_http_unittest.cc | 2 +- chrome/browser/printing/print_view_manager.cc | 2 +- chrome/browser/printing/print_view_manager.h | 2 +- chrome/browser/printing/print_view_manager_base.cc | 2 +- chrome/browser/printing/print_view_manager_base.h | 2 +- chrome/browser/printing/print_view_manager_common.cc | 2 +- chrome/browser/printing/print_view_manager_common.h | 2 +- chrome/browser/printing/printer_manager_dialog.h | 2 +- chrome/browser/printing/printing_init.cc | 2 +- chrome/browser/printing/printing_message_filter.cc | 2 +- chrome/browser/printing/printing_message_filter.h | 2 +- .../profiles/chrome_browser_main_extra_parts_profiles.cc | 2 +- chrome/browser/profiles/profile_impl.cc | 2 +- .../renderer_context_menu/render_view_context_menu.cc | 2 +- .../renderer_context_menu/render_view_context_menu.h | 2 +- chrome/browser/task_manager/web_contents_tags.cc | 2 +- chrome/browser/ui/BUILD.gn | 4 ++-- chrome/browser/ui/apps/chrome_app_delegate.cc | 2 +- chrome/browser/ui/browser.h | 2 +- chrome/browser/ui/browser_command_controller.cc | 2 +- chrome/browser/ui/browser_commands.cc | 2 +- chrome/browser/ui/browser_commands.h | 2 +- chrome/browser/ui/cocoa/accelerators_cocoa.mm | 2 +- chrome/browser/ui/libgtkui/BUILD.gn | 2 +- chrome/browser/ui/libgtkui/gtk_ui.cc | 2 +- chrome/browser/ui/startup/startup_browser_creator.cc | 2 +- chrome/browser/ui/tab_helpers.cc | 2 +- chrome/browser/ui/views/BUILD.gn | 2 +- chrome/browser/ui/views/accelerator_table.cc | 2 +- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc | 2 +- .../browser/ui/webui/local_discovery/local_discovery_ui.cc | 2 +- .../ui/webui/local_discovery/local_discovery_ui_handler.cc | 2 +- .../ui/webui/local_discovery/local_discovery_ui_handler.h | 2 +- .../browser/ui/webui/print_preview/print_preview_handler.cc | 2 +- .../browser/ui/webui/print_preview/print_preview_handler.h | 2 +- chrome/browser/ui/webui/print_preview/print_preview_ui.cc | 2 +- chrome/browser/ui/webui/print_preview/print_preview_ui.h | 2 +- .../ui/webui/print_preview/print_preview_ui_browsertest.cc | 2 +- chrome/browser/ui/webui/settings/md_settings_ui.cc | 2 +- chrome/browser/ui/webui/settings/printing_handler.h | 2 +- chrome/common/BUILD.gn | 6 +++--- chrome/common/all_messages.h | 2 +- chrome/common/chrome_features.h | 2 +- chrome/common/chrome_switches.cc | 2 +- chrome/common/chrome_switches.h | 2 +- chrome/common/chrome_utility_printing_messages.h | 2 +- chrome/common/common_message_generator.h | 2 +- chrome/common/features.gni | 2 +- chrome/common/webui_url_constants.h | 2 +- chrome/renderer/BUILD.gn | 2 +- chrome/renderer/chrome_content_renderer_client.cc | 2 +- chrome/renderer/chrome_content_renderer_client.h | 2 +- chrome/renderer/chrome_render_frame_observer.cc | 2 +- chrome/service/BUILD.gn | 2 +- chrome/test/BUILD.gn | 4 ++-- chrome/test/base/testing_browser_process.cc | 2 +- chrome/test/base/testing_browser_process.h | 2 +- chrome/test/base/web_ui_browser_test.cc | 2 +- chrome/utility/BUILD.gn | 4 ++-- chrome/utility/chrome_content_utility_client.h | 2 +- chrome/utility/printing_handler.cc | 2 +- chrome/utility/printing_handler.h | 2 +- components/BUILD.gn | 4 ++-- components/printing/common/print_messages.cc | 2 +- components/printing/common/print_messages.h | 2 +- components/printing/renderer/print_render_frame_helper.cc | 2 +- components/printing/renderer/print_render_frame_helper.h | 2 +- .../printing/renderer/print_render_frame_helper_linux.cc | 2 +- .../printing/renderer/print_render_frame_helper_mac.mm | 2 +- components/printing/service/BUILD.gn | 2 +- components/printing/test/print_mock_render_thread.cc | 2 +- components/printing/test/print_mock_render_thread.h | 2 +- .../printing/test/print_render_frame_helper_browsertest.cc | 2 +- .../printing/test/print_test_content_renderer_client.cc | 2 +- components/pwg_encoder/BUILD.gn | 2 +- components/renderer_context_menu/BUILD.gn | 2 +- components/renderer_context_menu/DEPS | 2 +- .../renderer_context_menu/context_menu_content_type.cc | 2 +- components/resources/BUILD.gn | 2 +- components/strings/BUILD.gn | 2 +- components/test/BUILD.gn | 2 +- content/browser/BUILD.gn | 4 ++-- .../renderer_host/pepper/pepper_print_settings_manager.cc | 2 +- content/renderer/BUILD.gn | 4 ++-- content/renderer/pepper/pepper_plugin_instance_impl.cc | 2 +- content/renderer/render_frame_proxy.cc | 2 +- headless/BUILD.gn | 2 +- headless/DEPS | 2 +- headless/lib/browser/headless_devtools_manager_delegate.h | 2 +- headless/lib/browser/headless_printing_unittest.cc | 2 +- headless/lib/browser/headless_web_contents_impl.cc | 2 +- headless/lib/headless_web_contents_browsertest.cc | 2 +- headless/lib/renderer/headless_content_renderer_client.cc | 2 +- headless/lib/utility/headless_content_utility_client.cc | 2 +- printing/BUILD.gn | 4 ++-- printing/{features => buildflags}/BUILD.gn | 6 +++--- .../{features/features.gni => buildflags/buildflags.gni} | 0 printing/print_job_constants.cc | 2 +- printing/print_job_constants.h | 2 +- printing/printing_context.cc | 2 +- printing/printing_context_win.cc | 2 +- skia/BUILD.gn | 2 +- 126 files changed, 139 insertions(+), 139 deletions(-) rename printing/{features => buildflags}/BUILD.gn (86%) rename printing/{features/features.gni => buildflags/buildflags.gni} (100%) diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 4f1c9a8b858ea7..945f7af6751093 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -155,7 +155,7 @@ if (!is_android && !is_mac) { public_deps = [] deps += [ "//build/config:exe_and_shlib_deps", - "//printing/features", + "//printing/buildflags", ] data += [ "$root_out_dir/resources.pak" ] diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn index d6c5e0d2e81d90..6a4237bc314123 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -7,7 +7,7 @@ import("//chrome/common/features.gni") import("//chromeos/assistant/assistant.gni") import("//components/nacl/features.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/catalog/public/tools/catalog.gni") import("//services/service_manager/public/service_manifest.gni") import("//tools/grit/grit_rule.gni") @@ -51,7 +51,7 @@ source_set("chrome_dll_resources") { # toggle off of the enable-basic-printing flag in the .rc file. defines = [ "ENABLE_BASIC_PRINTING_FOR_RC" ] } - deps += [ "//printing/features" ] + deps += [ "//printing/buildflags" ] } } @@ -335,7 +335,7 @@ static_library("test_support") { "//content/public/common:service_names", "//pdf", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//services/service_manager/embedder", "//ui/base", "//v8:v8_headers", diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index bce85c5661e61f..99b12b579fb6ef 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -58,7 +58,7 @@ #include "extensions/common/constants.h" #include "pdf/buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/embedder/switches.h" #include "ui/base/material_design/material_design_controller.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 2bdcc5b3526e24..04c1bcfe324f4e 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -20,7 +20,7 @@ import("//extensions/buildflags/buildflags.gni") import("//media/media_options.gni") import("//net/features.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//rlz/features/features.gni") import("//sandbox/features.gni") import("//third_party/protobuf/proto_library.gni") @@ -1780,7 +1780,7 @@ jumbo_split_static_library("browser") { "//net:extras", "//net:net_browser_services", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//rlz/features", "//services/data_decoder/public/cpp", "//services/device/public/cpp:device_features", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 2e93a0fc576d57..9785caaf1c5b65 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -111,7 +111,7 @@ #include "net/nqe/effective_connection_type.h" #include "net/nqe/network_quality_estimator_params.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/device/public/cpp/device_features.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/network_switches.h" diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index a9f055693eead2..72d0de6c7cfa3d 100644 --- a/chrome/browser/apps/app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -60,7 +60,7 @@ #include "extensions/test/extension_test_message_listener.h" #include "extensions/test/result_catcher.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index dc32648d8e1ca7..6609cd1f1c7907 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -130,7 +130,7 @@ #include "net/socket/client_socket_pool_manager.h" #include "net/url_request/url_request_context_getter.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/network_switches.h" #include "services/preferences/public/cpp/in_process_service_factory.h" #include "ui/base/idle/idle.h" diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index ba4e914299c1f8..3e4e38847c4d62 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -29,7 +29,7 @@ #include "extensions/buildflags/buildflags.h" #include "media/media_buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/network/public/mojom/network_service.mojom.h" class ChromeChildProcessWatcher; diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 920e85b1bdcd02..4861e3885df3e9 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -38,7 +38,7 @@ #include "components/tracing/common/tracing_switches.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/tracing_controller.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "rlz/features/features.h" #if defined(OS_WIN) diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index f544c760120633..0910a32aa5eb50 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -185,7 +185,7 @@ #include "net/http/http_network_layer.h" #include "net/http/http_stream_factory.h" #include "net/url_request/url_request.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "rlz/features/features.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index dd192bfea1f5e4..dfe2cbd422c3c9 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -242,7 +242,7 @@ #include "net/ssl/ssl_cert_request_info.h" #include "ppapi/buildflags/buildflags.h" #include "ppapi/host/ppapi_host.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/resource_request.h" #include "services/preferences/public/cpp/in_process_service_factory.h" diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 9dfae727644426..17456954de8abf 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -7,7 +7,7 @@ import("//build/config/ui.gni") import("//chromeos/assistant/assistant.gni") import("//extensions/buildflags/buildflags.gni") import("//media/media_options.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/service_manager/public/service_manifest.gni") import("//third_party/protobuf/proto_library.gni") import("//ui/ozone/ozone.gni") diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index c04aafbd583b7e..0d222ef2bce57f 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -868,7 +868,7 @@ static_library("extensions") { "//media:media_buildflags", "//net", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//rlz/features", "//services/audio/public/cpp", "//services/data_decoder/public/cpp", diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index e256545636c932..bd9b3d8ba8e75c 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc @@ -42,7 +42,7 @@ #include "extensions/browser/guest_view/web_view/web_view_guest.h" #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" #include "google_apis/gaia/gaia_urls.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "url/gurl.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc index 17dbddd0d731c8..08ca770cde341e 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc @@ -12,7 +12,7 @@ #include "chrome/common/extensions/api/cloud_print_private.h" #include "google_apis/google_api_keys.h" #include "net/base/network_interfaces.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace extensions { diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h index f24faac8edea18..0c1e3b60ef6d3d 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !BUILDFLAG(ENABLE_PRINT_PREVIEW) || defined(OS_CHROMEOS) #error "Print Preview must be enabled / Not supported on ChromeOS" diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc index 3b636e0fb9d50c..15ee5b3f6f23df 100644 --- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc @@ -13,7 +13,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/grit/browser_resources.h" #include "extensions/common/constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 679f4f55947463..a6de22be243a32 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -40,7 +40,7 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index 0502fb9cd1ba6f..da3c4393bd5fd5 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -90,7 +90,7 @@ #include "content/public/browser/histogram_fetcher.h" #include "content/public/browser/notification_service.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_ANDROID) #include "chrome/browser/metrics/android_metrics_provider.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 5515c2187f2bdf..851794fb5cebcb 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -112,7 +112,7 @@ #include "extensions/buildflags/buildflags.h" #include "net/http/http_server_properties_manager.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "rlz/features/features.h" #if BUILDFLAG(ENABLE_APP_LIST) diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index 278b8e5694a10f..9e6669533ab7ec 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -16,7 +16,7 @@ #include "chrome/common/cloud_print.mojom.h" #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !BUILDFLAG(ENABLE_PRINT_PREVIEW) || defined(OS_CHROMEOS) #error "Print Preview must be enabled / Not supported on ChromeOS" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h index 97115f0f360fe7..5206bcc0d4f78e 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h @@ -8,7 +8,7 @@ #include "base/memory/singleton.h" #include "build/build_config.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !BUILDFLAG(ENABLE_PRINT_PREVIEW) || defined(OS_CHROMEOS) #error "Print Preview must be enabled / Not supported on ChromeOS" diff --git a/chrome/browser/printing/cloud_print/privet_http_impl.cc b/chrome/browser/printing/cloud_print/privet_http_impl.cc index 23d3d320bb3508..f3e39783290aa0 100644 --- a/chrome/browser/printing/cloud_print/privet_http_impl.cc +++ b/chrome/browser/printing/cloud_print/privet_http_impl.cc @@ -24,7 +24,7 @@ #include "chrome/common/cloud_print/cloud_print_constants.h" #include "net/base/url_util.h" #include "net/traffic_annotation/network_traffic_annotation.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "url/gurl.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) diff --git a/chrome/browser/printing/cloud_print/privet_http_impl.h b/chrome/browser/printing/cloud_print/privet_http_impl.h index 09308d3fd73058..3896350cc6d098 100644 --- a/chrome/browser/printing/cloud_print/privet_http_impl.h +++ b/chrome/browser/printing/cloud_print/privet_http_impl.h @@ -16,7 +16,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/printing/cloud_print/privet_http.h" #include "components/cloud_devices/common/cloud_device_description.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/gfx/geometry/size.h" namespace cloud_print { diff --git a/chrome/browser/printing/cloud_print/privet_http_unittest.cc b/chrome/browser/printing/cloud_print/privet_http_unittest.cc index b1b3a4121c99ea..a52c3870046773 100644 --- a/chrome/browser/printing/cloud_print/privet_http_unittest.cc +++ b/chrome/browser/printing/cloud_print/privet_http_unittest.cc @@ -22,7 +22,7 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 8e115370d1d9ee..8b58460cfa1f80 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -24,7 +24,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/webplugininfo.h" #include "ipc/ipc_message_macros.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" using content::BrowserThread; diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h index 1008e97bd336ca..fab1927c40d267 100644 --- a/chrome/browser/printing/print_view_manager.h +++ b/chrome/browser/printing/print_view_manager.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "chrome/browser/printing/print_view_manager_base.h" #include "content/public/browser/web_contents_user_data.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace content { class RenderFrameHost; diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index bb389a667b3ebf..880daa319f48f6 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -47,7 +47,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/system/buffer.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/pdf_metafile_skia.h" #include "printing/print_settings.h" #include "printing/printed_document.h" diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index 67c6fea8e0d7e9..0516dd769c32a4 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h @@ -19,7 +19,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "mojo/public/cpp/system/platform_handle.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" struct PrintHostMsg_DidPrintDocument_Params; diff --git a/chrome/browser/printing/print_view_manager_common.cc b/chrome/browser/printing/print_view_manager_common.cc index 6301be53ec988c..1dac59c4e0b053 100644 --- a/chrome/browser/printing/print_view_manager_common.cc +++ b/chrome/browser/printing/print_view_manager_common.cc @@ -8,7 +8,7 @@ #include "content/public/browser/render_frame_host.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "url/gurl.h" #if BUILDFLAG(ENABLE_EXTENSIONS) diff --git a/chrome/browser/printing/print_view_manager_common.h b/chrome/browser/printing/print_view_manager_common.h index dff9e61b1cc5e0..92d912a4003dc9 100644 --- a/chrome/browser/printing/print_view_manager_common.h +++ b/chrome/browser/printing/print_view_manager_common.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_COMMON_H_ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_COMMON_H_ -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace content { class RenderFrameHost; diff --git a/chrome/browser/printing/printer_manager_dialog.h b/chrome/browser/printing/printer_manager_dialog.h index cc999217f6db82..6779a764664c22 100644 --- a/chrome/browser/printing/printer_manager_dialog.h +++ b/chrome/browser/printing/printer_manager_dialog.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PRINTING_PRINTER_MANAGER_DIALOG_H_ #include "base/macros.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !BUILDFLAG(ENABLE_PRINTING) #error "Printing must be enabled" diff --git a/chrome/browser/printing/printing_init.cc b/chrome/browser/printing/printing_init.cc index 37562cc1213528..daf12c69ad1f20 100644 --- a/chrome/browser/printing/printing_init.cc +++ b/chrome/browser/printing/printing_init.cc @@ -6,7 +6,7 @@ #include "components/printing/browser/print_manager_utils.h" #include "content/public/browser/web_contents.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "chrome/browser/printing/print_preview_message_handler.h" diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index 7d9b4a959e8075..a976099b924665 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -23,7 +23,7 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/child_process_host.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index f4db252ea9f307..8dc442cac35600 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -16,7 +16,7 @@ #include "components/prefs/pref_member.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" struct PrintHostMsg_ScriptedPrint_Params; class Profile; diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc index 0a42d758cf11c1..2bb211b225de54 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc @@ -86,7 +86,7 @@ #include "components/spellcheck/spellcheck_buildflags.h" #include "extensions/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_ANDROID) #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 69701e2a56be64..e2e3c46f5c948c 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -124,7 +124,7 @@ #include "extensions/buildflags/buildflags.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/identity/identity_service.h" #include "services/identity/public/mojom/constants.mojom.h" #include "services/preferences/public/cpp/in_process_service_factory.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index fb8cf0201c2069..4a0c764c21ef7e 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -120,7 +120,7 @@ #include "net/base/escape.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/interface_provider.h" #include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/WebKit/public/public_features.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h index d17832f8a49d55..7470c0bfe1114b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -22,7 +22,7 @@ #include "content/public/common/context_menu_params.h" #include "extensions/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/geometry/vector2d.h" diff --git a/chrome/browser/task_manager/web_contents_tags.cc b/chrome/browser/task_manager/web_contents_tags.cc index d5f3215484b9c6..4ae004549d573c 100644 --- a/chrome/browser/task_manager/web_contents_tags.cc +++ b/chrome/browser/task_manager/web_contents_tags.cc @@ -10,7 +10,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/view_type_utils.h" #include "extensions/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !defined(OS_ANDROID) #include "chrome/browser/task_manager/providers/web_contents/background_contents_tag.h" diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 85b26908b2cc5c..9a538c689bc675 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -14,7 +14,7 @@ import("//components/signin/features.gni") import("//extensions/buildflags/buildflags.gni") import("//media/media_options.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//rlz/features/features.gni") import("//ui/base/ui_features.gni") import("//ui/views/features.gni") @@ -1054,7 +1054,7 @@ split_static_library("ui") { "//media", "//net:net", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//rlz/features", "//services/metrics/public/cpp:ukm_builders", "//services/service_manager/runner/common", diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index d95ed7c6ac38c6..f6e065e2afb8f7 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc @@ -40,7 +40,7 @@ #include "content/public/browser/web_contents_delegate.h" #include "extensions/common/constants.h" #include "extensions/common/mojo/app_window.mojom.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/interface_provider.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 792784e6c06dfa..1e41bbdf84b440 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -43,7 +43,7 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/page_zoom.h" #include "extensions/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/page_transition_types.h" #include "ui/base/ui_base_types.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 715dc6d208e803..d37bb9e6854edb 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -58,7 +58,7 @@ #include "content/public/common/service_manager_connection.h" #include "content/public/common/url_constants.h" #include "extensions/browser/extension_system.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/events/keycodes/keyboard_codes.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index b9034c7dc3e5bf..e188e743956502 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -86,7 +86,7 @@ #include "content/public/common/user_agent.h" #include "extensions/buildflags/buildflags.h" #include "net/base/escape.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "rlz/features/features.h" #include "ui/base/clipboard/clipboard_types.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" diff --git a/chrome/browser/ui/browser_commands.h b/chrome/browser/ui/browser_commands.h index 464bcc6ef5d399..e97666b6a7f74e 100644 --- a/chrome/browser/ui/browser_commands.h +++ b/chrome/browser/ui/browser_commands.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" #include "content/public/common/page_zoom.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/window_open_disposition.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm index 7cd58a85952e15..3cea7836b0b679 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm @@ -13,7 +13,7 @@ #include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/app/chrome_command_ids.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #import "ui/base/accelerators/platform_accelerator_cocoa.h" #import "ui/events/cocoa/cocoa_event_utils.h" #import "ui/events/keycodes/keyboard_code_conversion_mac.h" diff --git a/chrome/browser/ui/libgtkui/BUILD.gn b/chrome/browser/ui/libgtkui/BUILD.gn index cc7663cbe6ce94..e9838d74e907bd 100644 --- a/chrome/browser/ui/libgtkui/BUILD.gn +++ b/chrome/browser/ui/libgtkui/BUILD.gn @@ -6,7 +6,7 @@ assert(is_linux, "This file should only be referenced on Linux") import("//build/config/features.gni") import("//build/config/linux/gtk/gtk.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") # Automatically depends on the GTK version associated with the current build # flags. diff --git a/chrome/browser/ui/libgtkui/gtk_ui.cc b/chrome/browser/ui/libgtkui/gtk_ui.cc index 6bb6394b5b2ccf..d19a1ad987bb7c 100644 --- a/chrome/browser/ui/libgtkui/gtk_ui.cc +++ b/chrome/browser/ui/libgtkui/gtk_ui.cc @@ -38,7 +38,7 @@ #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h" #include "chrome/browser/ui/libgtkui/unity_service.h" #include "chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 8a6f7276896404..8c7fa7758a4352 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -67,7 +67,7 @@ #include "content/public/common/content_switches.h" #include "extensions/common/switches.h" #include "net/base/port_util.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index 4d91df5f972885..150dc1957d5716 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -87,7 +87,7 @@ #include "components/ukm/content/source_url_recorder.h" #include "content/public/browser/web_contents.h" #include "extensions/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_ANDROID) #include "chrome/browser/android/chrome_feature_list.h" diff --git a/chrome/browser/ui/views/BUILD.gn b/chrome/browser/ui/views/BUILD.gn index db6b035928950a..4831e4588796f9 100644 --- a/chrome/browser/ui/views/BUILD.gn +++ b/chrome/browser/ui/views/BUILD.gn @@ -31,7 +31,7 @@ component("views") { "//components/keep_alive_registry", "//components/vector_icons", "//content/public/browser", - "//printing/features", + "//printing/buildflags", "//skia", "//ui/base", "//ui/events", diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc index a932487a8efcff..9a67390c242ceb 100644 --- a/chrome/browser/ui/views/accelerator_table.cc +++ b/chrome/browser/ui/views/accelerator_table.cc @@ -9,7 +9,7 @@ #include "base/macros.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 1d3e05be6f9f41..0dd6bc00d78181 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -91,7 +91,7 @@ #include "extensions/buildflags/buildflags.h" #include "media/media_buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/gfx/favicon_size.h" #include "ui/web_dialogs/web_dialog_ui.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc index 44c818a989c2e1..69f55e7bf8cd13 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc @@ -20,7 +20,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace { diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc index 57556f7bba9e4e..1d1f4db170d586 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc @@ -32,7 +32,7 @@ #include "components/prefs/pref_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "content/public/browser/web_ui.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/l10n/l10n_util.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h index 80302ce897ae45..29baef1168a5bc 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h @@ -16,7 +16,7 @@ #include "chrome/browser/printing/cloud_print/privet_http.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/browser/web_ui_message_handler.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS) #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index 4e3c95dbed7c3c..4a5410e4a56d73 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -71,7 +71,7 @@ #include "net/base/url_util.h" #include "printing/backend/print_backend.h" #include "printing/backend/print_backend_consts.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/print_settings.h" #include "third_party/icu/source/i18n/unicode/ulocdata.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index e7e3b87bcb16bb..27d7caa30c3af8 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h @@ -19,7 +19,7 @@ #include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "content/public/browser/web_ui_message_handler.h" #include "printing/backend/print_backend.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" class PdfPrinterHandler; class PrinterHandler; diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index f36e0bfb53ea25..23897aa15ed953 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -47,7 +47,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/common/constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h index 06c39ec2251c20..db9a4933bf575f 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" class PrintPreviewHandler; struct PrintHostMsg_DidGetPreviewPageCount_Params; diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index 070051eb31676d..8d8187548ad7a2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "url/url_constants.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc index 6b0c35d596c551..8366c8451608aa 100644 --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc @@ -48,7 +48,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_WIN) #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h" diff --git a/chrome/browser/ui/webui/settings/printing_handler.h b/chrome/browser/ui/webui/settings/printing_handler.h index 5759261d684ed3..6f993475678af1 100644 --- a/chrome/browser/ui/webui/settings/printing_handler.h +++ b/chrome/browser/ui/webui/settings/printing_handler.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "build/build_config.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if defined(OS_CHROMEOS) #error "Not for use on ChromeOS" diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index fdbc962b37e1bf..fc72fd822be13a 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -266,7 +266,7 @@ static_library("common") { "//mojo/public/cpp/bindings", "//pdf:buildflags", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//services/service_manager/sandbox", "//skia", "//third_party/icu", @@ -531,7 +531,7 @@ static_library("non_code_constants") { ] public_deps = [ - "//printing/features", + "//printing/buildflags", "//ui/base:ui_features", ] } @@ -559,7 +559,7 @@ static_library("constants") { ":non_code_constants", "//content/public/common:result_codes", "//extensions/buildflags", - "//printing/features", + "//printing/buildflags", "//rlz/features", "//ui/base:ui_features", ] diff --git a/chrome/common/all_messages.h b/chrome/common/all_messages.h index b7561c4399ce33..211030e352e4e8 100644 --- a/chrome/common/all_messages.h +++ b/chrome/common/all_messages.h @@ -12,7 +12,7 @@ #include "build/build_config.h" #include "components/nacl/common/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "chrome/common/common_message_generator.h" diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h index f58d05787892ff..ba711ba7d73dcd 100644 --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h @@ -15,7 +15,7 @@ #include "device/vr/buildflags/buildflags.h" #include "extensions/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/ui_features.h" namespace features { diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 7308c1af2450dc..57db344cb088e1 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace switches { diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index df649d5334b808..9836b3d77c19e6 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "chrome/common/buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/ui_features.h" // Don't add more switch files here. This is linked into some places like the diff --git a/chrome/common/chrome_utility_printing_messages.h b/chrome/common/chrome_utility_printing_messages.h index 6dfe3b430d7d9d..f903429e25e4e5 100644 --- a/chrome/common/chrome_utility_printing_messages.h +++ b/chrome/common/chrome_utility_printing_messages.h @@ -12,7 +12,7 @@ #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" #include "printing/backend/print_backend.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #define IPC_MESSAGE_START ChromeUtilityPrintingMsgStart diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h index 19e4f70e67bed8..7c27dd08309d1c 100644 --- a/chrome/common/common_message_generator.h +++ b/chrome/common/common_message_generator.h @@ -30,7 +30,7 @@ #include "content/public/common/common_param_traits_macros.h" #include "extensions/buildflags/buildflags.h" #include "media/media_buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_EXTENSIONS) #undef CHROME_COMMON_CAST_MESSAGES_H_ diff --git a/chrome/common/features.gni b/chrome/common/features.gni index 2c6bb35520a0e9..91fc30f692ba00 100644 --- a/chrome/common/features.gni +++ b/chrome/common/features.gni @@ -12,7 +12,7 @@ import("//extensions/buildflags/buildflags.gni") import("//media/media_options.gni") import("//net/features.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//ui/base/ui_features.gni") import("//ui/webui/webui_features.gni") diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h index 16c439e8ef84bf..18bb182ccc3e4e 100644 --- a/chrome/common/webui_url_constants.h +++ b/chrome/common/webui_url_constants.h @@ -14,7 +14,7 @@ #include "chrome/common/buildflags.h" #include "content/public/common/url_constants.h" #include "media/media_buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace chrome { diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index f6ca8d06a7645e..838bf826206ace 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -149,7 +149,7 @@ static_library("renderer") { "//mojo/public/cpp/bindings", "//net", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//services/metrics/public/cpp:metrics_cpp", "//services/metrics/public/mojom", "//services/service_manager/public/cpp", diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 15218945fa54e9..b92642eca149c7 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -108,7 +108,7 @@ #include "ppapi/buildflags/buildflags.h" #include "ppapi/c/private/ppb_pdf.h" #include "ppapi/shared_impl/ppapi_switches.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/interface_provider.h" #include "services/service_manager/public/cpp/service_context.h" diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index 9aab65ef3918c9..95f7101e8b202a 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -28,7 +28,7 @@ #include "ipc/ipc_channel_proxy.h" #include "media/media_buildflags.h" #include "ppapi/buildflags/buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/local_interface_provider.h" diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/chrome_render_frame_observer.cc index 18498c009c5452..6338e837a7caab 100644 --- a/chrome/renderer/chrome_render_frame_observer.cc +++ b/chrome/renderer/chrome_render_frame_observer.cc @@ -32,7 +32,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/window_features_converter.h" #include "extensions/common/constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "services/service_manager/public/cpp/binder_registry.h" #include "skia/ext/image_operations.h" #include "third_party/WebKit/public/common/associated_interfaces/associated_interface_provider.h" diff --git a/chrome/service/BUILD.gn b/chrome/service/BUILD.gn index e40896163c99bd..c0636c28721aa8 100644 --- a/chrome/service/BUILD.gn +++ b/chrome/service/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/features.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/catalog/public/tools/catalog.gni") assert(!is_chromeos) diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 1aa67fec5e77e5..6c624b076717cf 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -162,7 +162,7 @@ static_library("test_support") { "//net:test_support", "//pdf", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//skia", "//sql", "//sql:test_support", @@ -366,7 +366,7 @@ test("browser_tests") { "//media:media_buildflags", "//net:test_support", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//rlz/features", "//third_party/WebKit/public:features", ] diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc index e3ee15a83e7009..b098fb4c3768b6 100644 --- a/chrome/test/base/testing_browser_process.cc +++ b/chrome/test/base/testing_browser_process.cc @@ -32,7 +32,7 @@ #include "extensions/buildflags/buildflags.h" #include "media/media_buildflags.h" #include "net/url_request/url_request_context_getter.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "testing/gtest/include/gtest/gtest.h" #if BUILDFLAG(ENABLE_BACKGROUND_MODE) diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h index ac4a658edae96d..c3a4bf4da79a6c 100644 --- a/chrome/test/base/testing_browser_process.h +++ b/chrome/test/base/testing_browser_process.h @@ -22,7 +22,7 @@ #include "chrome/browser/browser_process_platform_part.h" #include "extensions/buildflags/buildflags.h" #include "media/media_buildflags.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" class BackgroundModeManager; class IOThread; diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc index 88e8a30d4dc815..ce70a9d7b0ef02 100644 --- a/chrome/test/base/web_ui_browser_test.cc +++ b/chrome/test/base/web_ui_browser_test.cc @@ -38,7 +38,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "net/base/filename_util.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/base/resource/resource_handle.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn index d9635a1f6b7e5a..8b0c261186fd26 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -7,7 +7,7 @@ import("//build/config/features.gni") import("//build/config/sysroot.gni") import("//chrome/common/features.gni") import("//extensions/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/service_manager/public/service_manifest.gni") static_library("utility") { @@ -43,7 +43,7 @@ static_library("utility") { "//ipc", "//media", "//net:net_with_v8", - "//printing/features", + "//printing/buildflags", "//services/network:network_service", "//services/service_manager/public/cpp", "//skia", diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h index 8a228d02368f2e..b11c68485b3b34 100644 --- a/chrome/utility/chrome_content_utility_client.h +++ b/chrome/utility/chrome_content_utility_client.h @@ -11,7 +11,7 @@ #include "base/macros.h" #include "build/build_config.h" #include "content/public/utility/content_utility_client.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" class MashServiceFactory; diff --git a/chrome/utility/printing_handler.cc b/chrome/utility/printing_handler.cc index 31e74fda213862..ff09b98ce804a8 100644 --- a/chrome/utility/printing_handler.cc +++ b/chrome/utility/printing_handler.cc @@ -10,7 +10,7 @@ #include "content/public/utility/utility_thread.h" #include "ipc/ipc_message.h" #include "printing/backend/print_backend.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace printing { diff --git a/chrome/utility/printing_handler.h b/chrome/utility/printing_handler.h index b56deaf18589ea..006966fd1c5886 100644 --- a/chrome/utility/printing_handler.h +++ b/chrome/utility/printing_handler.h @@ -9,7 +9,7 @@ #include "base/macros.h" #include "build/build_config.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if !defined(OS_WIN) || !BUILDFLAG(ENABLE_PRINT_PREVIEW) #error "Windows printing and print preview must be enabled" diff --git a/components/BUILD.gn b/components/BUILD.gn index 09e7d7ce9a5532..0be64ae8b2b250 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -7,7 +7,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//components/nacl/features.gni") import("//media/media_options.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//rlz/features/features.gni") import("//testing/test.gni") import("//tools/grit/repack.gni") @@ -473,7 +473,7 @@ if (!is_ios) { "//google_apis", "//ipc:test_support", "//net:test_support", - "//printing/features", + "//printing/buildflags", "//services/device/public/mojom", "//services/service_manager/public/cpp", "//services/service_manager/public/mojom", diff --git a/components/printing/common/print_messages.cc b/components/printing/common/print_messages.cc index 6df98550d22d2a..b308dc410ffba2 100644 --- a/components/printing/common/print_messages.cc +++ b/components/printing/common/print_messages.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/strings/string16.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "ui/gfx/geometry/size.h" // Generating implementations for all aspects of the IPC message diff --git a/components/printing/common/print_messages.h b/components/printing/common/print_messages.h index 22469f97d1f9af..d226923b299ef7 100644 --- a/components/printing/common/print_messages.h +++ b/components/printing/common/print_messages.h @@ -16,8 +16,8 @@ #include "build/build_config.h" #include "components/printing/common/printing_param_traits_macros.h" #include "ipc/ipc_message_macros.h" +#include "printing/buildflags/buildflags.h" #include "printing/common/pdf_metafile_utils.h" -#include "printing/features/features.h" #include "printing/page_range.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc index 2d81ba90d69c5c..dd9fba60de78dc 100644 --- a/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc @@ -34,7 +34,7 @@ #include "mojo/public/cpp/system/buffer.h" #include "mojo/public/cpp/system/platform_handle.h" #include "net/base/escape.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/metafile_skia_wrapper.h" #include "printing/pdf_metafile_skia.h" #include "printing/units.h" diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h index 64a6dd6a191266..d20d95920f7531 100644 --- a/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h @@ -17,7 +17,7 @@ #include "build/build_config.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/pdf_metafile_skia.h" #include "third_party/WebKit/public/platform/WebCanvas.h" #include "third_party/WebKit/public/web/WebNode.h" diff --git a/components/printing/renderer/print_render_frame_helper_linux.cc b/components/printing/renderer/print_render_frame_helper_linux.cc index 3b29a21be3e5e4..9da5b9553c7979 100644 --- a/components/printing/renderer/print_render_frame_helper_linux.cc +++ b/components/printing/renderer/print_render_frame_helper_linux.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "build/build_config.h" #include "components/printing/common/print_messages.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/metafile_skia_wrapper.h" #if defined(OS_ANDROID) diff --git a/components/printing/renderer/print_render_frame_helper_mac.mm b/components/printing/renderer/print_render_frame_helper_mac.mm index cf77c6828051b9..76aadcca306901 100644 --- a/components/printing/renderer/print_render_frame_helper_mac.mm +++ b/components/printing/renderer/print_render_frame_helper_mac.mm @@ -12,7 +12,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/metrics/histogram.h" #include "components/printing/common/print_messages.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/metafile_skia_wrapper.h" #include "printing/page_size_margins.h" #include "third_party/WebKit/public/platform/WebCanvas.h" diff --git a/components/printing/service/BUILD.gn b/components/printing/service/BUILD.gn index 26f339dea22e62..b67ffcba8a39d5 100644 --- a/components/printing/service/BUILD.gn +++ b/components/printing/service/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/service_manager/public/cpp/service.gni") import("//services/service_manager/public/service_manifest.gni") import("//services/service_manager/public/tools/test/service_test.gni") diff --git a/components/printing/test/print_mock_render_thread.cc b/components/printing/test/print_mock_render_thread.cc index 4fdbcceddd3e2d..011e41ed581b01 100644 --- a/components/printing/test/print_mock_render_thread.cc +++ b/components/printing/test/print_mock_render_thread.cc @@ -12,7 +12,7 @@ #include "build/build_config.h" #include "components/printing/test/mock_printer.h" #include "ipc/ipc_sync_message.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/page_range.h" #include "printing/print_job_constants.h" #include "printing/units.h" diff --git a/components/printing/test/print_mock_render_thread.h b/components/printing/test/print_mock_render_thread.h index d8e08d4239838f..9d115f936fa8cb 100644 --- a/components/printing/test/print_mock_render_thread.h +++ b/components/printing/test/print_mock_render_thread.h @@ -15,7 +15,7 @@ #include "base/single_thread_task_runner.h" #include "build/build_config.h" #include "content/public/test/mock_render_thread.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace base { class DictionaryValue; diff --git a/components/printing/test/print_render_frame_helper_browsertest.cc b/components/printing/test/print_render_frame_helper_browsertest.cc index 4d7b9e1bbe5a35..11638fc5cd9f93 100644 --- a/components/printing/test/print_render_frame_helper_browsertest.cc +++ b/components/printing/test/print_render_frame_helper_browsertest.cc @@ -24,7 +24,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/test/render_view_test.h" #include "ipc/ipc_listener.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/print_job_constants.h" #include "printing/units.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/printing/test/print_test_content_renderer_client.cc b/components/printing/test/print_test_content_renderer_client.cc index e9c1bcbb5debac..140d80c38b1fe7 100644 --- a/components/printing/test/print_test_content_renderer_client.cc +++ b/components/printing/test/print_test_content_renderer_client.cc @@ -7,7 +7,7 @@ #include #include "components/printing/renderer/print_render_frame_helper.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "third_party/WebKit/public/web/WebElement.h" namespace printing { diff --git a/components/pwg_encoder/BUILD.gn b/components/pwg_encoder/BUILD.gn index 452c53bff69ff8..96ae254116a990 100644 --- a/components/pwg_encoder/BUILD.gn +++ b/components/pwg_encoder/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") assert(enable_print_preview) diff --git a/components/renderer_context_menu/BUILD.gn b/components/renderer_context_menu/BUILD.gn index 367a58bdbd8797..7f134c3e7b6c34 100644 --- a/components/renderer_context_menu/BUILD.gn +++ b/components/renderer_context_menu/BUILD.gn @@ -23,7 +23,7 @@ static_library("renderer_context_menu") { "//content/public/browser", "//content/public/common", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//third_party/WebKit/public:blink_headers", "//ui/base", ] diff --git a/components/renderer_context_menu/DEPS b/components/renderer_context_menu/DEPS index bf929411529a84..b123010f8c8bd8 100644 --- a/components/renderer_context_menu/DEPS +++ b/components/renderer_context_menu/DEPS @@ -1,7 +1,7 @@ include_rules = [ "+content/public/browser", "+content/public/common", - "+printing/features", + "+printing/buildflags", "+ui/base", "+ui/gfx", "+ui/views", diff --git a/components/renderer_context_menu/context_menu_content_type.cc b/components/renderer_context_menu/context_menu_content_type.cc index 95dae075636712..658ba4c3ebe25d 100644 --- a/components/renderer_context_menu/context_menu_content_type.cc +++ b/components/renderer_context_menu/context_menu_content_type.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using blink::WebContextMenuData; diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn index ad5cec8d455450..b240ad23334cbd 100644 --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//tools/grit/grit_rule.gni") import("//third_party/brotli/brotli.gni") diff --git a/components/strings/BUILD.gn b/components/strings/BUILD.gn index 54fd83137100c7..ffdbb787a87822 100644 --- a/components/strings/BUILD.gn +++ b/components/strings/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/locales.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//tools/grit/grit_rule.gni") if (is_android) { diff --git a/components/test/BUILD.gn b/components/test/BUILD.gn index c60e9d1476527b..737c1a07ade3e3 100644 --- a/components/test/BUILD.gn +++ b/components/test/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/catalog/public/tools/catalog.gni") import("//services/service_manager/public/service_manifest.gni") diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index b4250c7b05abf3..306e3a08ed65bb 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -12,7 +12,7 @@ import("//gpu/vulkan/features.gni") import("//media/media_options.gni") import("//net/features.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//third_party/WebKit/public/public_features.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni") @@ -116,7 +116,7 @@ jumbo_source_set("browser") { "//net:extras", "//net:http_server", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//services/audio:lib", "//services/audio/public/cpp", "//services/audio/public/mojom:constants", diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc index 3f79f3198f077f..0a3c9da3d24c87 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc @@ -8,7 +8,7 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" #include "ppapi/c/pp_errors.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "printing/printing_context.h" // nogncheck diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index d138527e60eee5..8574669588f7b4 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -10,7 +10,7 @@ import("//build/split_static_library.gni") import("//content/common/features.gni") import("//media/media_options.gni") import("//ppapi/buildflags/buildflags.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//third_party/webrtc/webrtc.gni") import("//tools/ipc_fuzzer/ipc_fuzzer.gni") @@ -567,7 +567,7 @@ target(link_target_type, "renderer") { "//mojo/public/cpp/bindings", "//net", "//ppapi/buildflags", - "//printing/features", + "//printing/buildflags", "//sandbox", "//services/device/public/cpp/generic_sensor", "//services/device/public/mojom", diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index 5e957e704d8d3b..49ae8f22d261f1 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc @@ -94,7 +94,7 @@ #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_buffer_api.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/public/platform/URLConversion.h" #include "third_party/WebKit/public/platform/WebCoalescedInputEvent.h" diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc index 03dcf6c2bb2913..57fe79c56eb822 100644 --- a/content/renderer/render_frame_proxy.cc +++ b/content/renderer/render_frame_proxy.cc @@ -33,7 +33,7 @@ #include "content/renderer/render_widget.h" #include "content/renderer/resource_timing_info_conversions.h" #include "ipc/ipc_message_macros.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "third_party/WebKit/public/common/feature_policy/feature_policy.h" #include "third_party/WebKit/public/common/frame/frame_policy.h" #include "third_party/WebKit/public/platform/URLConversion.h" diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 401f6a80992aec..5c4d98c1db3bf6 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni") import("//build/util/process_version.gni") import("//headless/headless.gni") import("//mojo/public/tools/bindings/mojom.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//services/service_manager/public/service_manifest.gni") import("//testing/test.gni") import("//third_party/closure_compiler/compile_js.gni") diff --git a/headless/DEPS b/headless/DEPS index 5d6e91dc70d027..c7ff37fdd0a1e4 100644 --- a/headless/DEPS +++ b/headless/DEPS @@ -13,7 +13,7 @@ include_rules = [ "+content/public/test", "+mojo/public", "+net", - "+printing/features", + "+printing/buildflags", "+services/network/public/cpp", "+ui/base", "+ui/base/resource", diff --git a/headless/lib/browser/headless_devtools_manager_delegate.h b/headless/lib/browser/headless_devtools_manager_delegate.h index a332431f67ab0a..3126c9a3ff8737 100644 --- a/headless/lib/browser/headless_devtools_manager_delegate.h +++ b/headless/lib/browser/headless_devtools_manager_delegate.h @@ -15,7 +15,7 @@ #include "content/public/browser/devtools_manager_delegate.h" #include "headless/lib/browser/headless_network_conditions.h" #include "headless/public/headless_browser_context.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "headless/lib/browser/headless_print_manager.h" diff --git a/headless/lib/browser/headless_printing_unittest.cc b/headless/lib/browser/headless_printing_unittest.cc index 862b40870c0754..3628151f270b58 100644 --- a/headless/lib/browser/headless_printing_unittest.cc +++ b/headless/lib/browser/headless_printing_unittest.cc @@ -7,7 +7,7 @@ #include "base/values.h" #include "headless/lib/browser/headless_devtools_manager_delegate.h" #include "headless/lib/browser/headless_print_manager.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/units.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc index d9a6ca6e6d4197..fcc239b56a8899 100644 --- a/headless/lib/browser/headless_web_contents_impl.cc +++ b/headless/lib/browser/headless_web_contents_impl.cc @@ -36,7 +36,7 @@ #include "headless/lib/browser/headless_browser_main_parts.h" #include "headless/lib/browser/headless_tab_socket_impl.h" #include "headless/public/internal/headless_devtools_client_impl.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/compositor/compositor.h" #include "ui/gfx/switches.h" diff --git a/headless/lib/headless_web_contents_browsertest.cc b/headless/lib/headless_web_contents_browsertest.cc index 33b611524fd853..1d2f0b89627137 100644 --- a/headless/lib/headless_web_contents_browsertest.cc +++ b/headless/lib/headless_web_contents_browsertest.cc @@ -33,7 +33,7 @@ #include "headless/public/util/testing/test_in_memory_protocol_handler.h" #include "headless/test/headless_browser_test.h" #include "headless/test/tab_socket_test.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/headless/lib/renderer/headless_content_renderer_client.cc b/headless/lib/renderer/headless_content_renderer_client.cc index 8fabc7a6e2d898..2e7a7cdabaf99f 100644 --- a/headless/lib/renderer/headless_content_renderer_client.cc +++ b/headless/lib/renderer/headless_content_renderer_client.cc @@ -7,7 +7,7 @@ #include #include "headless/lib/renderer/headless_render_frame_controller_impl.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "components/printing/renderer/print_render_frame_helper.h" diff --git a/headless/lib/utility/headless_content_utility_client.cc b/headless/lib/utility/headless_content_utility_client.cc index d0e5f19d889860..d21c7aa04311c3 100644 --- a/headless/lib/utility/headless_content_utility_client.cc +++ b/headless/lib/utility/headless_content_utility_client.cc @@ -4,7 +4,7 @@ #include "headless/lib/utility/headless_content_utility_client.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "components/printing/service/public/cpp/pdf_compositor_service_factory.h" diff --git a/printing/BUILD.gn b/printing/BUILD.gn index d5d52d59cf8857..8f75d8f4c794f5 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/features.gni") import("//build/config/sysroot.gni") import("//build/config/ui.gni") import("//pdf/features.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//testing/test.gni") if (is_mac) { import("//build/config/mac/mac_sdk.gni") @@ -79,7 +79,7 @@ component("printing") { defines = [ "PRINTING_IMPLEMENTATION" ] public_deps = [ - "//printing/features", + "//printing/buildflags", ] deps = [ "//base", diff --git a/printing/features/BUILD.gn b/printing/buildflags/BUILD.gn similarity index 86% rename from printing/features/BUILD.gn rename to printing/buildflags/BUILD.gn index cdcfd794774c97..ceba2ef9552e01 100644 --- a/printing/features/BUILD.gn +++ b/printing/buildflags/BUILD.gn @@ -3,14 +3,14 @@ # found in the LICENSE file. import("//build/buildflag_header.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") # This file is in a separate directory so all targets in the build can refer to # the buildflag header to get the necessary preprocessor defines without # bringing in any printing targets. -buildflag_header("features") { - header = "features.h" +buildflag_header("buildflags") { + header = "buildflags.h" # Convenience define for ENABLE_BASIC_PRINTING || ENABLE_PRINT_PREVIEW. enable_printing = enable_basic_printing || enable_print_preview diff --git a/printing/features/features.gni b/printing/buildflags/buildflags.gni similarity index 100% rename from printing/features/features.gni rename to printing/buildflags/buildflags.gni diff --git a/printing/print_job_constants.cc b/printing/print_job_constants.cc index 8f03d3a8b2a386..d6f8f43e84467b 100644 --- a/printing/print_job_constants.cc +++ b/printing/print_job_constants.cc @@ -4,7 +4,7 @@ #include "printing/print_job_constants.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" namespace printing { diff --git a/printing/print_job_constants.h b/printing/print_job_constants.h index 888c6afefd0e1f..b543c7b9f8aa9b 100644 --- a/printing/print_job_constants.h +++ b/printing/print_job_constants.h @@ -6,7 +6,7 @@ #define PRINTING_PRINT_JOB_CONSTANTS_H_ #include "build/build_config.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/printing_export.h" namespace printing { diff --git a/printing/printing_context.cc b/printing/printing_context.cc index 89d86f2441984f..b2a6dcf034274a 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/values.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/page_setup.h" #include "printing/page_size_margins.h" #include "printing/print_job_constants.h" diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index ff0d705420f293..6beedaa43ceddd 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -15,7 +15,7 @@ #include "base/strings/utf_string_conversions.h" #include "printing/backend/print_backend.h" #include "printing/backend/win_helper.h" -#include "printing/features/features.h" +#include "printing/buildflags/buildflags.h" #include "printing/print_settings_initializer_win.h" #include "printing/printed_document.h" #include "printing/printing_context_system_dialog_win.h" diff --git a/skia/BUILD.gn b/skia/BUILD.gn index e1d56946c1737b..5ed078da6abe03 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/compiler/compiler.gni") import("//build/config/features.gni") import("//build/config/freetype/freetype.gni") import("//build/config/sanitizers/sanitizers.gni") -import("//printing/features/features.gni") +import("//printing/buildflags/buildflags.gni") import("//testing/test.gni") import("//third_party/skia/gn/shared_sources.gni") import("//gpu/vulkan/features.gni")