chromium/src
0
Fork 0
Code Activity

Replace IS_CHROMEOS_ASH with IS_CHROMEOS in printing.

Browse Source 
This is part of Lacros sunset. Since Lacros is gone, the two macros
mean the same thing.

Bug: 354842935
Change-Id: Ic65e6c43780f69ae12ea83c4601ba5dfcbf0d0fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6332390
Reviewed-by: Alan Screen <awscreen@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1429207}
This commit is contained in:
Yuta Hijikata
2025-03-06 15:14:50 -08:00
committed by Chromium LUCI CQ
parent 883a9107e5
commit 85708b278f
2 changed files with 3 additions and 9 deletions

5
printing/printing_utils.h

@ -14,13 +14,8 @@
#include "base/component_export.h"
#include "base/containers/span.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "printing/buildflags/buildflags.h"
#if BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS_ASH)
#endif
#if BUILDFLAG(IS_WIN)
#include "base/win/win_handle_types.h"
#include "ui/gfx/geometry/rect.h"

7
printing/printing_utils_unittest.cc

@ -11,7 +11,6 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/size.h"
@ -30,7 +29,7 @@ namespace {
constexpr size_t kTestLength = 8;
#if BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS)
constexpr gfx::Size kIsoA4Microns(210000, 297000);
constexpr gfx::Size kNaLetterMicrons(216000, 279000);
#endif
@ -75,7 +74,7 @@ TEST(PrintingUtilsTest, FormatDocumentTitleWithOwner) {
EXPECT_EQ("ab...j: ", Format("abcdefghij", "0123456789"));
}
#if BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS)
TEST(PrintingUtilsTest, GetDefaultPaperSizeFromLocaleMicrons) {
// Valid locales
EXPECT_EQ(kNaLetterMicrons, GetDefaultPaperSizeFromLocaleMicrons("en-US"));
@ -118,7 +117,7 @@ TEST(PrintingUtilsTest, SizesEqualWithinEpsilon) {
EXPECT_TRUE(
SizesEqualWithinEpsilon(kIsoA4Microns, gfx::Size(210500, 296500), 500));
}
#endif // BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS_ASH)
#endif // BUILDFLAG(USE_CUPS) && !BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN)
TEST(PrintingUtilsTest, GetCenteredPageContentRect) {