Commit 9a907751 authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

Lacros: Rename deprecated macro/gn names

This is a mechanical change that renames deprecated macro replacing:

- BUILDFLAG(IS_{ASH,LACROS}) with BUILDFLAG(IS_CHROMEOS_{ASH,LACROS}),
- gn var is_{ash,lacros} with is_chromeos_{ash,lacros}.

There is a section about the renaming on http://go/lacros-macros.

Bug: 1052397
Change-Id: I281524bf9fecaa6ed36cf1de87221a79506ec0b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2594623Reviewed-by: default avatarHidehiko Abe <hidehiko@chromium.org>
Reviewed-by: default avatarK. Moon <kmoon@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837831}
parent 03af6a3c
...@@ -1463,7 +1463,7 @@ void OutOfProcessInstance::SaveToBuffer(const std::string& token) { ...@@ -1463,7 +1463,7 @@ void OutOfProcessInstance::SaveToBuffer(const std::string& token) {
message.Set(kJSDataToSave, buffer); message.Set(kJSDataToSave, buffer);
} }
} else { } else {
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
uint32_t length = engine()->GetLoadedByteSize(); uint32_t length = engine()->GetLoadedByteSize();
if (IsSaveDataSizeValid(length)) { if (IsSaveDataSizeValid(length)) {
pp::VarArrayBuffer buffer(length); pp::VarArrayBuffer buffer(length);
...@@ -1473,7 +1473,7 @@ void OutOfProcessInstance::SaveToBuffer(const std::string& token) { ...@@ -1473,7 +1473,7 @@ void OutOfProcessInstance::SaveToBuffer(const std::string& token) {
} }
#else #else
NOTREACHED(); NOTREACHED();
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
} }
PostMessage(message); PostMessage(message);
......
...@@ -36,13 +36,13 @@ class ScopedSdkInitializer { ...@@ -36,13 +36,13 @@ class ScopedSdkInitializer {
} // namespace } // namespace
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
std::vector<uint8_t> CreateFlattenedPdf( std::vector<uint8_t> CreateFlattenedPdf(
base::span<const uint8_t> input_buffer) { base::span<const uint8_t> input_buffer) {
ScopedSdkInitializer scoped_sdk_initializer(/*enable_v8=*/false); ScopedSdkInitializer scoped_sdk_initializer(/*enable_v8=*/false);
return PDFEngineExports::Get()->CreateFlattenedPdf(input_buffer); return PDFEngineExports::Get()->CreateFlattenedPdf(input_buffer);
} }
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_WIN) #if defined(OS_WIN)
bool RenderPDFPageToDC(base::span<const uint8_t> pdf_buffer, bool RenderPDFPageToDC(base::span<const uint8_t> pdf_buffer,
......
...@@ -31,12 +31,12 @@ class SizeF; ...@@ -31,12 +31,12 @@ class SizeF;
namespace chrome_pdf { namespace chrome_pdf {
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// Create a flattened PDF document from an existing PDF document. // Create a flattened PDF document from an existing PDF document.
// |input_buffer| is the buffer that contains the entire PDF document to be // |input_buffer| is the buffer that contains the entire PDF document to be
// flattened. // flattened.
std::vector<uint8_t> CreateFlattenedPdf(base::span<const uint8_t> input_buffer); std::vector<uint8_t> CreateFlattenedPdf(base::span<const uint8_t> input_buffer);
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_WIN) #if defined(OS_WIN)
// Printing modes - type to convert PDF to for printing. See PDFium's // Printing modes - type to convert PDF to for printing. See PDFium's
......
...@@ -543,11 +543,11 @@ class PDFEngineExports { ...@@ -543,11 +543,11 @@ class PDFEngineExports {
static PDFEngineExports* Get(); static PDFEngineExports* Get();
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// See the definition of CreateFlattenedPdf in pdf.cc for details. // See the definition of CreateFlattenedPdf in pdf.cc for details.
virtual std::vector<uint8_t> CreateFlattenedPdf( virtual std::vector<uint8_t> CreateFlattenedPdf(
base::span<const uint8_t> input_buffer) = 0; base::span<const uint8_t> input_buffer) = 0;
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_WIN) #if defined(OS_WIN)
// See the definition of RenderPDFPageToDC in pdf.cc for details. // See the definition of RenderPDFPageToDC in pdf.cc for details.
......
...@@ -32,11 +32,11 @@ const base::Feature kPdfXfaSupport = {"PdfXfaSupport", ...@@ -32,11 +32,11 @@ const base::Feature kPdfXfaSupport = {"PdfXfaSupport",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kSaveEditedPDFForm = {"SaveEditedPDFForm", const base::Feature kSaveEditedPDFForm = {"SaveEditedPDFForm",
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
base::FEATURE_ENABLED_BY_DEFAULT base::FEATURE_ENABLED_BY_DEFAULT
#else #else
base::FEATURE_DISABLED_BY_DEFAULT base::FEATURE_DISABLED_BY_DEFAULT
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
}; };
const base::Feature kTabAcrossPDFAnnotations = { const base::Feature kTabAcrossPDFAnnotations = {
......
...@@ -227,7 +227,7 @@ PDFiumEngineExports::PDFiumEngineExports() {} ...@@ -227,7 +227,7 @@ PDFiumEngineExports::PDFiumEngineExports() {}
PDFiumEngineExports::~PDFiumEngineExports() {} PDFiumEngineExports::~PDFiumEngineExports() {}
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
std::vector<uint8_t> PDFiumEngineExports::CreateFlattenedPdf( std::vector<uint8_t> PDFiumEngineExports::CreateFlattenedPdf(
base::span<const uint8_t> input_buffer) { base::span<const uint8_t> input_buffer) {
ScopedFPDFDocument doc = LoadPdfData(input_buffer); ScopedFPDFDocument doc = LoadPdfData(input_buffer);
...@@ -235,7 +235,7 @@ std::vector<uint8_t> PDFiumEngineExports::CreateFlattenedPdf( ...@@ -235,7 +235,7 @@ std::vector<uint8_t> PDFiumEngineExports::CreateFlattenedPdf(
return std::vector<uint8_t>(); return std::vector<uint8_t>();
return PDFiumPrint::CreateFlattenedPdf(std::move(doc)); return PDFiumPrint::CreateFlattenedPdf(std::move(doc));
} }
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_WIN) #if defined(OS_WIN)
bool PDFiumEngineExports::RenderPDFPageToDC( bool PDFiumEngineExports::RenderPDFPageToDC(
......
...@@ -22,10 +22,10 @@ class PDFiumEngineExports : public PDFEngineExports { ...@@ -22,10 +22,10 @@ class PDFiumEngineExports : public PDFEngineExports {
~PDFiumEngineExports() override; ~PDFiumEngineExports() override;
// PDFEngineExports: // PDFEngineExports:
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
std::vector<uint8_t> CreateFlattenedPdf( std::vector<uint8_t> CreateFlattenedPdf(
base::span<const uint8_t> input_buffer) override; base::span<const uint8_t> input_buffer) override;
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if defined(OS_WIN) #if defined(OS_WIN)
bool RenderPDFPageToDC(base::span<const uint8_t> pdf_buffer, bool RenderPDFPageToDC(base::span<const uint8_t> pdf_buffer,
int page_number, int page_number,
......
...@@ -272,14 +272,14 @@ PDFiumPrint::PDFiumPrint(PDFiumEngine* engine) : engine_(engine) {} ...@@ -272,14 +272,14 @@ PDFiumPrint::PDFiumPrint(PDFiumEngine* engine) : engine_(engine) {}
PDFiumPrint::~PDFiumPrint() = default; PDFiumPrint::~PDFiumPrint() = default;
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// static // static
std::vector<uint8_t> PDFiumPrint::CreateFlattenedPdf(ScopedFPDFDocument doc) { std::vector<uint8_t> PDFiumPrint::CreateFlattenedPdf(ScopedFPDFDocument doc) {
if (!FlattenPrintData(doc.get())) if (!FlattenPrintData(doc.get()))
return std::vector<uint8_t>(); return std::vector<uint8_t>();
return ConvertDocToBuffer(std::move(doc)); return ConvertDocToBuffer(std::move(doc));
} }
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
// static // static
std::vector<uint32_t> PDFiumPrint::GetPageNumbersFromPrintPageNumberRange( std::vector<uint32_t> PDFiumPrint::GetPageNumbersFromPrintPageNumberRange(
......
...@@ -32,12 +32,12 @@ class PDFiumPrint { ...@@ -32,12 +32,12 @@ class PDFiumPrint {
PDFiumPrint& operator=(const PDFiumPrint&) = delete; PDFiumPrint& operator=(const PDFiumPrint&) = delete;
~PDFiumPrint(); ~PDFiumPrint();
#if BUILDFLAG(IS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// Flattens the |doc|. // Flattens the |doc|.
// On success, returns the flattened version of |doc| as a vector. // On success, returns the flattened version of |doc| as a vector.
// On failure, returns an empty vector. // On failure, returns an empty vector.
static std::vector<uint8_t> CreateFlattenedPdf(ScopedFPDFDocument doc); static std::vector<uint8_t> CreateFlattenedPdf(ScopedFPDFDocument doc);
#endif // BUILDFLAG(IS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
static std::vector<uint32_t> GetPageNumbersFromPrintPageNumberRange( static std::vector<uint32_t> GetPageNumbersFromPrintPageNumberRange(
const PP_PrintPageNumberRange_Dev* page_ranges, const PP_PrintPageNumberRange_Dev* page_ranges,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment