Replace IS_CHROMEOS_ASH with IS_CHROMEOS in chrome [12/N].
This is part of Lacros sunset. Since Lacros is gone, the two macros
mean the same thing.
Bug: 354842935
Change-Id: Ib7fa4507d2378290b29b392d9262d851bac462ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6332909
Reviewed-by: Georg Neis <[email protected]>
Commit-Queue: Yuta Hijikata <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1428781}
diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc
index 41f9ac9a..eb57680b 100644
--- a/chrome/browser/resources_util.cc
+++ b/chrome/browser/resources_util.cc
@@ -16,12 +16,11 @@
#include "base/containers/flat_map.h"
#include "base/no_destructor.h"
#include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
#include "chrome/grit/theme_resources_map.h"
#include "components/grit/components_scaled_resources_map.h"
#include "ui/resources/grit/ui_resources_map.h"
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
#include "ui/chromeos/resources/grit/ui_chromeos_resources_map.h"
#endif
@@ -37,7 +36,7 @@
ThemeMap() {
size_t storage_size =
kComponentsScaledResourcesSize + kThemeResourcesSize + kUiResourcesSize;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
storage_size += kUiChromeosResourcesSize;
#endif
@@ -55,7 +54,7 @@
for (size_t i = 0; i < kUiResourcesSize; ++i) {
storage.emplace_back(kUiResources[i].path, kUiResources[i].id);
}
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
for (size_t i = 0; i < kUiChromeosResourcesSize; ++i) {
storage.emplace_back(kUiChromeosResources[i].path,
kUiChromeosResources[i].id);
