Commit 2cc851f1 authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

LaCrOS: Replace defined(OS_CHROMEOS) with BUILDFLAG(IS_CHROMEOS_ASH)

The change is mostly mechanical replacing defined(OS_CHROMEOS) with
BUILDFLAG(IS_CHROMEOS_ASH) and GN variable is_chromeos with
is_chromeos_ash with some special cases (For those cases please
refer to http://go/lacros-macros).

The patch is made in preparation to switching lacros build from
target_os=linux to target_os=chromeos. This will prevent lacros from
changing behaviour after the switch.

Bug: 1052397
Change-Id: I3cfc0267c733659383f007e19cc98ec174ed1026
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592220Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837887}
parent bc42b9b0
......@@ -4,6 +4,7 @@
#include "ui/base/ime/fake_text_input_client.h"
#include "build/chromeos_buildflags.h"
#include "ui/events/event_constants.h"
#include "ui/gfx/geometry/rect.h"
......
......@@ -168,6 +168,7 @@ static_library("test_support") {
public_deps = [ ":compositor" ]
deps = [
"//base/test:test_support",
"//build:chromeos_buildflags",
"//cc",
"//cc:test_support",
"//components/viz/host",
......@@ -251,6 +252,7 @@ test("compositor_unittests") {
":test_support",
"//base",
"//base/test:test_support",
"//build:chromeos_buildflags",
"//cc",
"//cc:test_support",
"//components/viz/common",
......
......@@ -8,6 +8,7 @@
#include "base/run_loop.h"
#include "base/test/task_environment.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/compositor/test/test_context_factories.h"
#include "ui/gfx/geometry/rect.h"
......
......@@ -9,6 +9,7 @@
#include "base/test/task_environment.h"
#include "base/timer/timer.h"
#include "build/chromeos_buildflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/layer.h"
......
......@@ -10,6 +10,7 @@
#include "base/test/bind.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "cc/metrics/frame_sequence_metrics.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_sequence.h"
......
......@@ -4,6 +4,7 @@
import("//build/config/chromecast_build.gni")
import("//build/config/chromeos/ui_mode.gni")
import("//build/config/chromeos/ui_mode.gni")
declare_args() {
# Should ANGLE be linked statically?
......@@ -17,7 +18,8 @@ declare_args() {
# Should Dawn support be compiled to back the WebGPU implementation?
# Also controls linking Dawn depedencies in such as SPIRV-Tools/SPIRV-Cross.
use_dawn = is_mac || is_win || is_chromeos || (is_linux && !is_chromecast)
use_dawn = is_mac || is_win || is_chromeos_ash ||
((is_linux || is_chromeos_lacros) && !is_chromecast)
# Should Dawn test binaries (unittests, end2end_tests, perf_tests) be built?
# Independent of use_dawn, which controls whether Dawn is used in Chromium.
......
......@@ -733,7 +733,7 @@ component("views") {
"corewm/tooltip_win.cc",
]
}
if (!is_chromeos) {
if (!is_chromeos_ash) {
sources += [
"accessibility/views_ax_tree_manager.cc",
"accessibility/widget_ax_tree_id_map.cc",
......
......@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/chromeos_buildflags.h"
#include "ui/accessibility/accessibility_features.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/accessibility/ax_tree_manager_map.h"
......@@ -62,7 +63,7 @@ ViewAccessibility::ViewAccessibility(View* view)
focused_virtual_child_(nullptr),
is_leaf_(false),
is_ignored_(false) {
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
if (features::IsAccessibilityTreeForViewsEnabled()) {
Widget* widget = view_->GetWidget();
if (widget && widget->is_top_level() &&
......@@ -158,7 +159,7 @@ bool ViewAccessibility::IsLeaf() const {
ViewsAXTreeManager* ViewAccessibility::AXTreeManager() const {
ViewsAXTreeManager* manager = nullptr;
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
Widget* widget = view_->GetWidget();
// Don't return managers for closing Widgets.
......
......@@ -12,6 +12,7 @@
#include "base/callback_forward.h"
#include "base/strings/string16.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "ui/accessibility/ax_enums.mojom-forward.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/accessibility/platform/ax_unique_id.h"
......@@ -222,7 +223,7 @@ class VIEWS_EXPORT ViewAccessibility {
Widget* next_focus_ = nullptr;
Widget* previous_focus_ = nullptr;
#if defined(USE_AURA) && !defined(OS_CHROMEOS)
#if defined(USE_AURA) && !BUILDFLAG(IS_CHROMEOS_ASH)
// Each instance of ViewAccessibility that's associated with a root View
// owns an ViewsAXTreeManager. For other Views, this should be nullptr.
std::unique_ptr<views::ViewsAXTreeManager> ax_tree_manager_;
......
......@@ -24,7 +24,7 @@ generate_grd("build_grdp") {
"customize_themes/colorize.svg",
"customize_themes/brush.svg",
]
if (is_chromeos) {
if (is_chromeos_ash) {
input_files += [
"chromeos/multidevice_setup/start_setup_icon_1x.png",
"chromeos/multidevice_setup/start_setup_icon_2x.png",
......
......@@ -2,6 +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")
import("//ui/webui/resources/tools/generate_grd.gni")
generate_grd("build_grdp") {
......@@ -61,7 +62,7 @@ generate_grd("build_grdp") {
]
}
if (is_chromeos) {
if (is_chromeos_ash) {
input_files += [
# Similar to error.svg except that it is white-filled instead of
# transparent-filled. Useful for badging images where the background may
......
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