0

Replace usage of is_chromeos_ash with is_chromeos in ash/.

Also remove import of ui_mode.gni.

This is part of Lacros sunset.

Bug: 373972275
Change-Id: Id68be2534c6fcdf7c4905151b88df2aa5a451783
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6320613
Reviewed-by: Georg Neis <neis@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1427521}
This commit is contained in:
Yuta Hijikata
2025-03-03 19:09:40 -08:00
committed by Chromium LUCI CQ
parent 898c9e9ef2
commit 10616566c8
50 changed files with 50 additions and 129 deletions
ash
BUILD.gn
ambient
app_list
BUILD.gn
model
vector_icons
app_menu
assistant
model
ui
BUILD.gn
colors
test_support
util
BUILD.gn
test_support
birch
constants
dbus
in_session_auth
keyboard
login
resources
public
cpp
BUILD.gn
ambient
app_list
vector_icons
assistant
test_support
holding_space
resources
mojom
quick_insert
resources
quick_pair
BUILD.gn
common
companion_app
fast_pair_handshake
feature_status_tracker
keyed_service
message_stream
pairing
proto
repository
scanning
ui
resources
BUILD.gn
vector_icons
search_box
strings
style
system
diagnostics
mahi
resources
video_conference
resources
utility
wm
overview
birch
resources

@ -4,7 +4,6 @@
import("//ash/ambient/resources/resources.gni")
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//chromeos/ash/components/assistant/ambient.gni")
@ -16,7 +15,7 @@ import("//ui/base/ui_features.gni")
# Historical note: Ash shipped on Windows for a couple years to support
# Windows 8 Metro mode. Windows support was removed in 2016.
assert(is_chromeos_ash)
assert(is_chromeos)
assert(use_aura)
assert(enable_hidpi)

@ -4,11 +4,10 @@
import("//ash/ambient/resources/resources.gni")
import("//build/cipd/cipd.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
import("//ui/webui/resources/tools/generate_grd.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
assert(include_ash_ambient_animation_resources)
lottie_resources_grd_file = "$target_gen_dir/lottie_resources.grd"

@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
declare_args() {
# Build flag to include resources for the animated screensaver in ash builds.
@ -13,5 +12,5 @@ declare_args() {
# ambient mode resources from CIPD in the DEPS file.
#
# May be overridden locally to false for testing purposes if desired.
include_ash_ambient_animation_resources = is_chromeos_ash && is_chrome_branded
include_ash_ambient_animation_resources = is_chromeos && is_chrome_branded
}

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("app_list") {
sources = [

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
component("app_list_model") {
sources = [

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//components/vector_icons/vector_icons.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
# The icons should be used only within //chrome/browser/ash/app_list/search.
aggregate_vector_icons("app_list_vector_icons") {

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
component("app_menu") {
sources = [

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
component("model") {
output_name = "assistant_model"

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("constants") {
defines = [ "IS_ASSISTANT_UI_CONSTANTS_IMPL" ]

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/style_variable_generator/style_variable_generator.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
style_variable_generator("assistant_colors") {
sources = [

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
static_library("test_support") {
testonly = true

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
component("util") {
output_name = "assistant_util"

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
static_library("test_support") {
testonly = true

@ -4,7 +4,7 @@
import("//third_party/protobuf/proto_library.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
proto_library("removed_items_proto") {
sources = [ "removed_items.proto" ]

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash")
assert(is_chromeos, "Non-Chrome-OS builds must not depend on //ash")
component("constants") {
output_name = "ash_constants"

@ -6,7 +6,7 @@
import("//third_party/protobuf/proto_library.gni")
assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
assert(is_chromeos, "Non-ChromeOS builds cannot depend on //ash")
proto_library("privacy_screen_proto") {
sources = [

@ -4,7 +4,7 @@
import("//build/config/ui.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("in_session_auth") {
sources = [

@ -2,14 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
import("//third_party/google_input_tools/closure.gni")
import("//third_party/google_input_tools/inputview.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
component("ui") {
sources = [

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("resources") {
source = "login_resources.grd"

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//mojo/public/tools/bindings/mojom.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
# C++ headers and sources that can be used outside ash.
component("cpp") {

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//third_party/protobuf/proto_library.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
proto_library("proto") {
sources = [ "photo_cache_entry.proto" ]

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//components/vector_icons/vector_icons.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
aggregate_vector_icons("app_list_vector_icons") {
icon_directory = "."

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
static_library("test_support") {
testonly = true

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("test_support") {
testonly = true

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("ash_public_unscaled_resources") {
source = "ash_public_unscaled_resources.grd"

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//mojo/public/tools/bindings/mojom.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
mojom("mojom") {
disable_variants = true

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("quick_insert_resources") {
source = "quick_insert_resources.grd"

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
group("quick_pair") {
deps = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
component("common") {
output_name = "quick_pair_common"

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("companion_app") {
output_name = "quick_pair_companion_app"

@ -2,11 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("fast_pair_handshake") {
sources = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
static_library("feature_status_tracker") {
sources = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
# TODO(b/279954848): Convert this to a component build
static_library("keyed_service") {

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("message_stream") {
sources = [

@ -2,11 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//testing/libfuzzer/fuzzer_test.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("pairing") {
sources = [

@ -2,11 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//third_party/protobuf/proto_library.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
proto_library("fastpair_proto") {
sources = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("repository") {
sources = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("scanning") {
sources = [

@ -2,10 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash,
"Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
assert(is_chromeos, "Quick Pair protocols (e.g. Fast Pair) are ash-chrome only")
source_set("ui") {
output_name = "quick_pair_ui"

@ -4,12 +4,11 @@
import("//ash/ambient/resources/resources.gni")
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//chromeos/ash/components/scalable_iph/scalable_iph.gni")
import("//tools/grit/repack.gni")
import("//ui/base/ui_features.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
assert(enable_hidpi)

@ -3,10 +3,9 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//components/vector_icons/vector_icons.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
aggregate_vector_icons("ash_vector_icons") {
icon_directory = "."

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("search_box") {
sources = [

@ -3,12 +3,11 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/locales.gni")
import("//tools/grit/grit_rule.gni")
import("//tools/grit/repack.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("strings") {
source = "../ash_strings.grd"

@ -2,9 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
source_set("style") {
sources = [ "ash_color_id.h" ]

@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
mojom("color_scheme") {
sources = [ "color_scheme.mojom" ]

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//mojo/public/tools/bindings/mojom.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
mojom("mojom") {
sources = [ "input.mojom" ]

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("mahi_resources") {
source = "mahi_resources.grd"

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("vc_resources") {
source = "vc_resources.grd"

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//third_party/protobuf/proto_library.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
proto_library("proto") {
sources = [ "persistent_proto_test.proto" ]

@ -2,10 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/chromeos/ui_mode.gni")
import("//tools/grit/grit_rule.gni")
assert(is_chromeos_ash)
assert(is_chromeos)
grit("coral_resources") {
source = "coral_resources.grd"