Commit 45cd7073 authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

Lacros: Rename deprecated macro and gn variable names.

The change replaces deprecated variable names is_ash, is_lacros,
IS_ASH, IS_LACROS with is_chromeos_ash, is_chromeos_lacros,
IS_CHROMEOS_ASH and IS_CHROMEOS_LACROS.

Bug: 1052397
Change-Id: Id8e24910248b5537ba7e558b02be10c2ee7c2a84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2621793Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842894}
parent 5a7ec9ae
...@@ -179,7 +179,7 @@ namespace { ...@@ -179,7 +179,7 @@ namespace {
void BindShapeDetectionServiceOnIOThread( void BindShapeDetectionServiceOnIOThread(
mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService> mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService>
receiver) { receiver) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_ASH) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
content::ServiceProcessHost::Launch< content::ServiceProcessHost::Launch<
shape_detection::mojom::ShapeDetectionService>( shape_detection::mojom::ShapeDetectionService>(
std::move(receiver), content::ServiceProcessHost::Options() std::move(receiver), content::ServiceProcessHost::Options()
......
...@@ -85,7 +85,7 @@ target(link_target_type, "gpu_sources") { ...@@ -85,7 +85,7 @@ target(link_target_type, "gpu_sources") {
"//ui/latency/ipc", "//ui/latency/ipc",
] ]
if (!is_ash || !is_chrome_branded) { if (!is_chromeos_ash || !is_chrome_branded) {
deps += [ deps += [
"//services/shape_detection:lib", "//services/shape_detection:lib",
"//services/shape_detection/public/mojom", "//services/shape_detection/public/mojom",
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "build/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "media/mojo/buildflags.h" #include "media/mojo/buildflags.h"
#if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || !BUILDFLAG(IS_ASH) #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || !BUILDFLAG(IS_CHROMEOS_ASH)
#include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck #include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck
#include "services/shape_detection/shape_detection_service.h" // nogncheck #include "services/shape_detection/shape_detection_service.h" // nogncheck
#endif #endif
...@@ -30,7 +30,7 @@ void GpuChildThread::BindServiceInterface( ...@@ -30,7 +30,7 @@ void GpuChildThread::BindServiceInterface(
return; return;
} }
#if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || !BUILDFLAG(IS_ASH) #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || !BUILDFLAG(IS_CHROMEOS_ASH)
if (auto shape_detection_receiver = if (auto shape_detection_receiver =
receiver.As<shape_detection::mojom::ShapeDetectionService>()) { receiver.As<shape_detection::mojom::ShapeDetectionService>()) {
static base::NoDestructor<shape_detection::ShapeDetectionService> service{ static base::NoDestructor<shape_detection::ShapeDetectionService> service{
......
...@@ -81,7 +81,7 @@ source_set("utility") { ...@@ -81,7 +81,7 @@ source_set("utility") {
] ]
} }
if (is_ash && is_chrome_branded) { if (is_chromeos_ash && is_chrome_branded) {
deps += [ deps += [
"//services/shape_detection:lib", "//services/shape_detection:lib",
"//services/shape_detection/public/mojom", "//services/shape_detection/public/mojom",
......
...@@ -63,7 +63,7 @@ extern sandbox::TargetServices* g_utility_target_services; ...@@ -63,7 +63,7 @@ extern sandbox::TargetServices* g_utility_target_services;
#include "sandbox/policy/sandbox_type.h" #include "sandbox/policy/sandbox_type.h"
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_ASH) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
#include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck #include "services/shape_detection/public/mojom/shape_detection_service.mojom.h" // nogncheck
#include "services/shape_detection/shape_detection_service.h" // nogncheck #include "services/shape_detection/shape_detection_service.h" // nogncheck
#endif #endif
...@@ -175,7 +175,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::AudioService> receiver) { ...@@ -175,7 +175,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::AudioService> receiver) {
return audio::CreateStandaloneService(std::move(receiver)); return audio::CreateStandaloneService(std::move(receiver));
} }
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_ASH) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
auto RunShapeDetectionService( auto RunShapeDetectionService(
mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService> mojo::PendingReceiver<shape_detection::mojom::ShapeDetectionService>
receiver) { receiver) {
...@@ -242,7 +242,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { ...@@ -242,7 +242,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
services.Add(RunTracing); services.Add(RunTracing);
services.Add(RunVideoCapture); services.Add(RunVideoCapture);
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_ASH) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && BUILDFLAG(IS_CHROMEOS_ASH)
services.Add(RunShapeDetectionService); services.Add(RunShapeDetectionService);
#endif #endif
......
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