Skip to content

Commit

Permalink
Rename buildflag_headers for consistency
Browse files Browse the repository at this point in the history
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 <dcheng@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547228}
  • Loading branch information
Scott Violet authored and Commit Bot committed Mar 30, 2018
1 parent 2719870 commit 318a55f
Show file tree
Hide file tree
Showing 126 changed files with 139 additions and 139 deletions.
2 changes: 1 addition & 1 deletion chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
6 changes: 3 additions & 3 deletions chrome/app/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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" ]
}
}

Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/chrome_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/about_flags.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/apps/app_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/browser_process_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/browser_process_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/browser_shutdown.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chrome_browser_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chrome_content_browser_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/chromeos/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/component_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/metrics/chrome_metrics_service_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/prefs/browser_prefs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/cloud_print/privet_http_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/cloud_print/privet_http_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager_common.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/print_view_manager_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/printer_manager_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/printing_init.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/printing_message_filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/printing/printing_message_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/task_manager/web_contents_tags.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 318a55f

Please sign in to comment.