Replace usage of is_chromeos_ash with is_chromeos in chrome.
This is part of Lacros sunset. Since Lacros is gone, the two variables
mean the same thing.
Bug: 373972275
Change-Id: Ib131f7cdbbb8d56b96bc4ddde7ab1bbb4faa3918
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6320813
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1428085}
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index 8f146e2..8dff8a3 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -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/locales.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
@@ -70,7 +69,7 @@
"//ui/views/resources",
]
}
- if (is_chromeos_ash) {
+ if (is_chromeos) {
sources += [
"$root_gen_dir/ash/login/resources/login_resources_${percent}_percent.pak",
"$root_gen_dir/chrome/chromeos_app_icon_resources_${percent}_percent.pak",
@@ -247,7 +246,7 @@
deps += [ "//chrome/browser/resources/settings_shared:resources" ]
}
}
- if (is_chromeos_ash) {
+ if (is_chromeos) {
sources += [
"$root_gen_dir/ash/public/cpp/resources/ash_public_unscaled_resources.pak",
"$root_gen_dir/ash/quick_insert/resources/quick_insert_resources.pak",
@@ -298,10 +297,12 @@
"$root_gen_dir/chrome/bluetooth_pairing_dialog_resources.pak",
"$root_gen_dir/chrome/borealis_installer_resources.pak",
"$root_gen_dir/chrome/cloud_upload_resources.pak",
+ "$root_gen_dir/chrome/common/chromeos/extensions/chromeos_system_extensions_resources.pak",
"$root_gen_dir/chrome/cros_styles_resources.pak",
"$root_gen_dir/chrome/crostini_installer_resources.pak",
"$root_gen_dir/chrome/crostini_upgrader_resources.pak",
"$root_gen_dir/chrome/desk_api_resources.pak",
+ "$root_gen_dir/chrome/dlp_internals_resources.pak",
"$root_gen_dir/chrome/edu_coexistence_resources.pak",
"$root_gen_dir/chrome/emoji_picker_resources.pak",
"$root_gen_dir/chrome/enterprise_reporting_resources.pak",
@@ -310,6 +311,7 @@
"$root_gen_dir/chrome/healthd_internals_resources.pak",
"$root_gen_dir/chrome/internet_config_dialog_resources.pak",
"$root_gen_dir/chrome/internet_detail_dialog_resources.pak",
+ "$root_gen_dir/chrome/kerberos_resources.pak",
"$root_gen_dir/chrome/launcher_internals_resources.pak",
"$root_gen_dir/chrome/lock_screen_reauth_resources.pak",
"$root_gen_dir/chrome/manage_mirrorsync_resources.pak",
@@ -320,6 +322,7 @@
"$root_gen_dir/chrome/network_ui_resources.pak",
"$root_gen_dir/chrome/notification_tester_resources.pak",
"$root_gen_dir/chrome/office_fallback_resources.pak",
+ "$root_gen_dir/chrome/office_web_app_resources.pak",
"$root_gen_dir/chrome/oobe_resources.pak",
"$root_gen_dir/chrome/orca_resources.pak",
"$root_gen_dir/chrome/os_settings_resources.pak",
@@ -393,6 +396,10 @@
"//ash/webui/status_area_internals/resources:resources",
"//ash/webui/vc_background_ui/resources:resources",
"//ash/wm/overview/birch/resources:coral_resources",
+ "//chrome/browser/resources:office_web_app_resources",
+ "//chrome/browser/resources/chromeos/dlp_internals:resources",
+ "//chrome/browser/resources/chromeos/kerberos:resources",
+ "//chrome/common/chromeos/extensions:resources",
"//chromeos/ash/components/emoji:resources",
"//chromeos/ash/components/kiosk/vision/webui:resources",
"//chromeos/ash/experiences/arc/input_overlay/resources",
@@ -418,21 +425,7 @@
deps += [ "//ash/ambient/resources:lottie_resources" ]
}
}
- if (is_chromeos) {
- sources += [
- "$root_gen_dir/chrome/common/chromeos/extensions/chromeos_system_extensions_resources.pak",
- "$root_gen_dir/chrome/dlp_internals_resources.pak",
- "$root_gen_dir/chrome/kerberos_resources.pak",
- "$root_gen_dir/chrome/office_web_app_resources.pak",
- ]
- deps += [
- "//chrome/browser/resources:office_web_app_resources",
- "//chrome/browser/resources/chromeos/dlp_internals:resources",
- "//chrome/browser/resources/chromeos/kerberos:resources",
- "//chrome/common/chromeos/extensions:resources",
- ]
- }
- if (!is_android && !is_chromeos_ash) {
+ if (!is_android && !is_chromeos) {
sources += [
"$root_gen_dir/chrome/intro_resources.pak",
"$root_gen_dir/chrome/profile_picker_resources.pak",
@@ -460,9 +453,15 @@
]
}
- if (is_win || is_mac || is_linux || is_chromeos_ash) {
- sources += [ "$root_gen_dir/chrome/connectors_internals_resources.pak" ]
- deps += [ "//chrome/browser/resources/connectors_internals:resources" ]
+ if (is_win || is_mac || is_linux || is_chromeos) {
+ sources += [
+ "$root_gen_dir/chrome/connectors_internals_resources.pak",
+ "$root_gen_dir/chrome/discards_resources.pak",
+ ]
+ deps += [
+ "//chrome/browser/resources/connectors_internals:resources",
+ "//chrome/browser/resources/discards:resources",
+ ]
}
if (is_win || is_mac || is_linux) {
@@ -470,11 +469,6 @@
deps += [ "//chrome/browser/resources/browser_switch:resources" ]
}
- if (is_win || is_mac || is_linux || is_chromeos) {
- sources += [ "$root_gen_dir/chrome/discards_resources.pak" ]
- deps += [ "//chrome/browser/resources/discards:resources" ]
- }
-
if (!is_android) {
sources += [ "$root_gen_dir/components/headless/command_handler/headless_command_resources.pak" ]
deps += [ "//components/headless/command_handler" ]
diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni
index c3b77e36..3588fa3 100644
--- a/chrome/chrome_repack_locales.gni
+++ b/chrome/chrome_repack_locales.gni
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/chrome_build.gni")
-import("//build/config/chromeos/ui_mode.gni")
import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//extensions/buildflags/buildflags.gni")
@@ -75,30 +74,29 @@
}
if (is_chromeos) {
- source_patterns +=
- [ "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_" ]
- deps += [ "//ui/chromeos/strings" ]
- if (is_chrome_branded) {
- source_patterns += [ "${root_gen_dir}/chrome/app/theme/google_chrome/chromeos/strings/chromeos_chrome_internal_strings_" ]
- deps += [ "//chrome/app/theme/google_chrome/chromeos/strings" ]
- }
- }
- if (is_chromeos_ash) {
source_patterns += [
"${root_gen_dir}/ash/strings/ash_strings_",
"${root_gen_dir}/ash/webui/camera_app_ui/resources/strings/ash_camera_app_strings_",
"${root_gen_dir}/chromeos/strings/chromeos_strings_",
"${root_gen_dir}/remoting/resources/",
+ "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_",
]
deps += [
"//ash/strings",
"//ash/webui/camera_app_ui/resources/strings",
"//chromeos/strings",
"//remoting/resources",
+ "//ui/chromeos/strings",
]
if (is_chrome_branded) {
- source_patterns += [ "${root_gen_dir}/chromeos/ash/resources/internal/strings/ash_internal_strings_" ]
- deps += [ "//chromeos/ash/resources/internal/strings" ]
+ source_patterns += [
+ "${root_gen_dir}/chrome/app/theme/google_chrome/chromeos/strings/chromeos_chrome_internal_strings_",
+ "${root_gen_dir}/chromeos/ash/resources/internal/strings/ash_internal_strings_",
+ ]
+ deps += [
+ "//chrome/app/theme/google_chrome/chromeos/strings",
+ "//chromeos/ash/resources/internal/strings",
+ ]
}
compress = true
}
diff --git a/chrome/gpu/BUILD.gn b/chrome/gpu/BUILD.gn
index d8af0562..7d7bf49 100644
--- a/chrome/gpu/BUILD.gn
+++ b/chrome/gpu/BUILD.gn
@@ -2,7 +2,6 @@
# 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("//media/media_options.gni")
import("//third_party/widevine/cdm/widevine.gni")
@@ -29,12 +28,9 @@
]
if (is_chromeos) {
- deps +=
- [ "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_gpu" ]
- }
- if (is_chromeos_ash) {
deps += [
"//chromeos/ash/experiences/arc/mojom:media",
+ "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_gpu",
"//gpu/command_buffer/service",
"//services/service_manager/public/cpp",
"//ui/ozone",
diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
index cd49d6f..7874c58 100644
--- a/chrome/installer/linux/BUILD.gn
+++ b/chrome/installer/linux/BUILD.gn
@@ -4,7 +4,6 @@
import("//build/config/c++/c++.gni")
import("//build/config/chrome_build.gni")
-import("//build/config/chromeos/ui_mode.gni")
import("//build/config/features.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/sysroot.gni")
@@ -324,7 +323,7 @@
outputs = [ "$root_out_dir/installer/theme/{{source_file_part}}" ]
}
-if (!is_chromeos_ash) {
+if (!is_chromeos) {
copy("rpm_packaging_files") {
visibility = [ ":*" ]
sources = [
@@ -390,7 +389,7 @@
"//third_party/swiftshader/src/Vulkan:swiftshader_libvulkan",
]
}
- if (!is_chromeos_ash) {
+ if (!is_chromeos) {
public_deps += [ ":rpm_packaging_files" ]
}
if (build_with_internal_optimization_guide) {
@@ -479,7 +478,7 @@
]
}
- if (!is_chromeos_ash) {
+ if (!is_chromeos) {
rpm_target_name = "${target_name}_rpm"
action(rpm_target_name) {
visibility = [ ":*" ]
@@ -533,7 +532,7 @@
group(target_name) {
deps = [ ":$deb_target_name" ]
- if (!is_chromeos_ash) {
+ if (!is_chromeos) {
deps += [ ":$rpm_target_name" ]
}
}
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 15957be..ffd3e6d1 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/buildflags_paint_preview.gni")
-import("//build/config/chromeos/ui_mode.gni")
import("//build/config/features.gni")
import("//chrome/common/features.gni")
import("//components/nacl/features.gni")
@@ -42,9 +41,6 @@
"//url/mojom:url_mojom_origin_js",
]
if (is_chromeos) {
- deps += [ "//chromeos/components/remote_apps/mojom:mojom_js" ]
- }
- if (is_chromeos_ash) {
deps += [
# The JS binding files of seal.mojom will be imported to Google3 via
# copybara.
@@ -53,6 +49,7 @@
"//chromeos/ash/components/enhanced_network_tts/mojom:mojom_js",
"//chromeos/ash/services/ime/public/mojom:mojom_js",
"//chromeos/ash/services/orca/public/mojom:mojom_js",
+ "//chromeos/components/remote_apps/mojom:mojom_js",
"//chromeos/services/tts/public/mojom:mojom_js",
]
}
@@ -432,7 +429,7 @@
}
}
- if (is_chromeos_ash) {
+ if (is_chromeos) {
sources += [
"ash_merge_session_loader_throttle.cc",
"ash_merge_session_loader_throttle.h",
diff --git a/chrome/renderer/extensions/BUILD.gn b/chrome/renderer/extensions/BUILD.gn
index d51f81d7..addc5f8 100644
--- a/chrome/renderer/extensions/BUILD.gn
+++ b/chrome/renderer/extensions/BUILD.gn
@@ -2,7 +2,6 @@
# 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("//build/config/features.gni")
import("//extensions/buildflags/buildflags.gni")
import("//printing/buildflags/buildflags.gni")
@@ -95,6 +94,8 @@
sources += [
"api/file_browser_handler_custom_bindings.cc",
"api/file_browser_handler_custom_bindings.h",
+ "api/file_manager_private_custom_bindings.cc",
+ "api/file_manager_private_custom_bindings.h",
"api/platform_keys_natives.cc",
"api/platform_keys_natives.h",
]
@@ -105,12 +106,5 @@
]
}
}
-
- if (is_chromeos_ash) {
- sources += [
- "api/file_manager_private_custom_bindings.cc",
- "api/file_manager_private_custom_bindings.h",
- ]
- }
}
}
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index 185e70a..aad8bc1a 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -2,7 +2,6 @@
# 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("//build/config/features.gni")
import("//build/config/sysroot.gni")
import("//chrome/common/features.gni")
@@ -181,7 +180,7 @@
}
}
- if (is_chromeos_ash) {
+ if (is_chromeos) {
deps += [
"//chrome/services/file_util",
"//chrome/services/sharing",
@@ -200,6 +199,10 @@
"//chromeos/ash/services/orca/public/mojom",
"//chromeos/ash/services/quick_pair",
"//chromeos/ash/services/recording",
+ "//chromeos/components/mahi:content_extraction",
+ "//chromeos/components/mahi/public/mojom",
+ "//chromeos/components/quick_answers/public/cpp",
+ "//chromeos/components/quick_answers/public/mojom",
"//chromeos/constants:constants",
"//chromeos/services/tts",
"//chromeos/services/tts/public/mojom",
@@ -218,15 +221,6 @@
deps += [ "//chrome/services/pdf:lib" ]
}
- if (is_chromeos) {
- deps += [
- "//chromeos/components/mahi:content_extraction",
- "//chromeos/components/mahi/public/mojom",
- "//chromeos/components/quick_answers/public/cpp",
- "//chromeos/components/quick_answers/public/mojom",
- ]
- }
-
# NSS decryptor is not needed on ChromeOS.
if (!is_chromeos && use_nss_certs) {
sources += [
@@ -247,7 +241,7 @@
deps += [ "//chrome/services/printing:lib" ]
}
- if (is_chromeos_ash) {
+ if (is_chromeos) {
deps += [
"//chrome/services/ipp_parser",
"//chrome/services/ipp_parser/public/mojom",
