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_ash
with some special cases (For those cases please refer to
https://chromium.googlesource.com/chromium/src.git/+/master/docs/lacros.md#gn-var-and-c_macros-for-lacros).

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: I17c77521ce2902225352e425cc4a6dfb94a939b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536429Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835022}

ui/events/BUILD.gn

@@ -146,6 +146,7 @@ component("events_base") {
   deps = [
     ":dom_keycode_converter",
     "//base/third_party/dynamic_annotations",
+    "//build:chromeos_buildflags",
   ]
 
   public_deps = [
@@ -346,6 +347,8 @@ component("events") {
       "gestures/gesture_recognizer_impl.cc",
       "gestures/motion_event_aura.cc",
     ]
+
+    deps += [ "//build:chromeos_buildflags" ]
   }
 
   if (is_win || is_mac || use_x11 || use_ozone) {
@@ -437,6 +440,7 @@ component("gesture_detection") {
     ":events_base",
     "//base",
     "//base/third_party/dynamic_annotations",
+    "//build:chromeos_buildflags",
     "//ui/display",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -503,6 +507,7 @@ static_library("test_support") {
   ]
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//skia",
     "//ui/events/platform",
     "//ui/gfx",

ui/events/base_event_utils.cc

@@ -10,6 +10,7 @@
 #include "base/lazy_instance.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
 
@@ -17,14 +18,14 @@ namespace ui {
 
 namespace {
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 const int kSystemKeyModifierMask = EF_ALT_DOWN | EF_COMMAND_DOWN;
 #elif defined(OS_APPLE)
 // Alt modifier is used to input extended characters on Mac.
 const int kSystemKeyModifierMask = EF_COMMAND_DOWN;
 #else
 const int kSystemKeyModifierMask = EF_ALT_DOWN;
-#endif  // !defined(OS_CHROMEOS) && !defined(OS_APPLE)
+#endif  // !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_APPLE)
 
 bool IsValidTimebase(base::TimeTicks now, base::TimeTicks timestamp) {
   int64_t delta = (now - timestamp).InMilliseconds();

ui/events/devices/x11/BUILD.gn

@@ -26,6 +26,7 @@ component("x11") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
+    "//build:chromeos_buildflags",
     "//skia",
     "//ui/display",
     "//ui/events:events_base",

ui/events/devices/x11/touch_factory_x11.cc

@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/system/sys_info.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/device_list_cache_x11.h"
@@ -222,7 +223,7 @@ void TouchFactory::SetupXI2ForXWindow(x11::Window window) {
   // these events.
   SetXinputMask(mask_data, x11::Input::HierarchyEvent::opcode);
   SetXinputMask(mask_data, x11::Input::DeviceChangedEvent::opcode);
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     SetXinputMask(mask_data, x11::Input::DeviceEvent::KeyPress);
     SetXinputMask(mask_data, x11::Input::DeviceEvent::KeyRelease);

ui/events/gesture_detection/gesture_configuration.cc

@@ -5,6 +5,8 @@
 #include "build/build_config.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
+#include "build/chromeos_buildflags.h"
+
 namespace ui {
 namespace {
 
@@ -49,16 +51,16 @@ GestureConfiguration::GestureConfiguration()
       // See crbug.com/357237 for details.
       min_scaling_span_in_pixels_(125),
       min_swipe_velocity_(20),
-      // TODO(jdduke): Disable and remove entirely when issues with intermittent
-      // scroll end detection on the Pixel are resolved, crbug.com/353702.
-#if defined(OS_CHROMEOS)
+// TODO(jdduke): Disable and remove entirely when issues with intermittent
+// scroll end detection on the Pixel are resolved, crbug.com/353702.
+#if BUILDFLAG(IS_CHROMEOS_ASH)
       scroll_debounce_interval_in_ms_(30),
 #else
       scroll_debounce_interval_in_ms_(0),
 #endif
       semi_long_press_time_in_ms_(400),
       show_press_delay_in_ms_(150),
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
       single_pointer_cancel_enabled_(true),
 #else
       single_pointer_cancel_enabled_(false),

ui/events/gesture_detection/gesture_configuration_aura.cc

@@ -7,16 +7,17 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event_switches.h"
 
 namespace ui {
 namespace {
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 constexpr bool kDoubleTapAuraSupport = true;
 #else
 constexpr bool kDoubleTapAuraSupport = false;
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 class GestureConfigurationAura : public GestureConfiguration {
  public:
@@ -29,7 +30,7 @@ class GestureConfigurationAura : public GestureConfiguration {
 
  private:
   GestureConfigurationAura() : GestureConfiguration() {
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
     // On ChromeOS, use 6 which is derived from the android's default(8),
     // multiplied by base dpi ratio(0.75).  See crbug.com/1083120 for more
     // details.

ui/events/gesture_detection/gesture_detector.cc

@@ -11,6 +11,7 @@
 #include "base/numerics/ranges.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/gesture_listeners.h"
 #include "ui/events/gesture_detection/motion_event.h"
@@ -52,7 +53,7 @@ GestureDetector::Config::Config()
       two_finger_tap_max_separation(300),
       two_finger_tap_timeout(base::TimeDelta::FromMilliseconds(700)),
       single_tap_repeat_interval(1),
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
       stylus_button_accelerated_longpress_enabled(true),
 #else
       stylus_button_accelerated_longpress_enabled(false),

ui/events/gestures/gesture_provider_aura.cc

@@ -8,6 +8,7 @@
 
 #include "base/auto_reset.h"
 #include "base/check.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ -18,11 +19,11 @@ namespace ui {
 
 namespace {
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 constexpr bool kDoubleTapPlatformSupport = true;
 #else
 constexpr bool kDoubleTapPlatformSupport = false;
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 }  // namespace
 

ui/events/keycodes/BUILD.gn

@@ -21,6 +21,7 @@ source_set("xkb") {
 
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//ui/events:dom_keycode_converter",
   ]
 }

ui/events/keycodes/keyboard_code_conversion_xkb.cc

@@ -5,6 +5,7 @@
 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
 
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/keycodes/dom/dom_key.h"
 #include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
 #include "ui/gfx/x/keysyms/keysyms.h"
@@ -202,7 +203,7 @@ DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym) {
       return DomKey::CONTROL;
     case XKB_KEY_Caps_Lock:
       return DomKey::CAPS_LOCK;
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
     case XKB_KEY_Meta_L:
     case XKB_KEY_Meta_R:
     case XKB_KEY_Alt_L:
@@ -217,7 +218,7 @@ DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym) {
     case XKB_KEY_Alt_L:
     case XKB_KEY_Alt_R:
       return DomKey::ALT;
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
     case XKB_KEY_Super_L:
     case XKB_KEY_Super_R:
       return DomKey::META;

ui/events/ozone/BUILD.gn

@@ -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("//build/config/features.gni")
 import("//build/config/ui.gni")
 
@@ -41,7 +42,7 @@ component("ozone") {
 
   defines = [ "IS_EVENTS_OZONE_IMPL" ]
 
-  if (is_chromeos) {
+  if (is_chromeos_ash) {
     sources += [
       "chromeos/cursor_controller.cc",
       "chromeos/cursor_controller.h",
@@ -72,7 +73,7 @@ source_set("unittests") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_chromeos) {
+  if (is_chromeos_ash) {
     sources += [ "chromeos/cursor_controller_unittest.cc" ]
   }
 

ui/events/ozone/evdev/BUILD.gn

@@ -107,6 +107,7 @@ component("evdev") {
 
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//ui/display",
     "//ui/events",
     "//ui/events:dom_keycode_converter",
@@ -186,6 +187,7 @@ source_set("unittests") {
     ":evdev",
     "//base",
     "//base/test:test_support",
+    "//build:chromeos_buildflags",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/events",

ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc

@@ -17,6 +17,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
 
 namespace ui {
@@ -226,13 +227,13 @@ void DumpTouchEventLog(
     if (converter->HasTouchscreen()) {
       std::string touch_evdev_log_filename = GenerateEventLogName(
           out_dir, "evdev_input_events_", now, converter->id());
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
       converter->DumpTouchEventLog(touch_evdev_log_filename.c_str());
 #else
       converter->DumpTouchEventLog(kInputEventsLogFile);
       base::Move(base::FilePath(kInputEventsLogFile),
                  base::FilePath(touch_evdev_log_filename));
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
       log_paths.push_back(base::FilePath(touch_evdev_log_filename));
     }
   }

ui/events/ozone/evdev/touch_filter/palm_detection_filter_factory.cc

@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/system/sys_info.h"
 #include "base/time/time.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/touch_filter/heuristic_stylus_palm_detection_filter.h"
 #include "ui/events/ozone/evdev/touch_filter/neural_stylus_palm_detection_filter.h"
@@ -62,7 +63,7 @@ std::string FetchNeuralPalmRadiusPolynomial(const EventDeviceInfo& devinfo,
   }
 
   // TODO(robsc): Remove this when comfortable.
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   // We should really only be running in chromeos anyway; We do a check here
   // temporarily for hatch and reef.  These numbers should live in config on
   // chromeos side but for now during experiment are hard-coded here.

ui/events/ozone/evdev/touch_filter/palm_detection_filter_factory_unittest.cc

@@ -8,6 +8,7 @@
 
 #include "base/test/scoped_chromeos_version_info.h"
 #include "base/test/scoped_feature_list.h"
+#include "build/chromeos_buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_device_test_util.h"
@@ -51,7 +52,7 @@ class PalmDetectionFilterFactoryTest : public testing::Test {
 class PalmDetectionFilterFactoryDeathTest
     : public PalmDetectionFilterFactoryTest {};
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 TEST_F(PalmDetectionFilterFactoryTest, RadiusesFromLSBRelease) {
   {
     base::test::ScopedChromeOSVersionInfo version(

ui/events/ozone/layout/BUILD.gn

@@ -48,7 +48,10 @@ component("layout") {
       "xkb/xkb_keyboard_layout_engine.h",
     ]
 
-    deps += [ "//ui/events/keycodes:xkb" ]
+    deps += [
+      "//build:chromeos_buildflags",
+      "//ui/events/keycodes:xkb",
+    ]
   }
 }
 

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

@@ -21,6 +21,7 @@
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/dom_key.h"
@@ -610,7 +611,7 @@ const PrintableSimpleEntry kSimpleMap[] = {
     {0x0259, VKEY_OEM_3},      // schwa
 };
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 void LoadKeymap(const std::string& layout_name,
                 scoped_refptr<base::SingleThreadTaskRunner> reply_runner,
                 LoadKeymapCallback reply_callback) {
@@ -669,7 +670,7 @@ XkbKeyboardLayoutEngine::~XkbKeyboardLayoutEngine() {
 }
 
 bool XkbKeyboardLayoutEngine::CanSetCurrentLayout() const {
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   return true;
 #else
   return false;
@@ -678,7 +679,7 @@ bool XkbKeyboardLayoutEngine::CanSetCurrentLayout() const {
 
 bool XkbKeyboardLayoutEngine::SetCurrentLayoutByName(
     const std::string& layout_name) {
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   current_layout_name_ = layout_name;
   for (const auto& entry : xkb_keymaps_) {
     if (entry.layout_name == layout_name) {
@@ -696,7 +697,7 @@ bool XkbKeyboardLayoutEngine::SetCurrentLayoutByName(
                      std::move(reply_callback)));
 #else
   NOTIMPLEMENTED();
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
   return true;
 }
 
@@ -877,7 +878,7 @@ void XkbKeyboardLayoutEngine::SetKeymap(xkb_keymap* keymap) {
   }
 
   layout_index_ = 0;
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   // Update num lock mask.
   num_lock_mod_mask_ = num_lock_mask;
 #endif
@@ -892,7 +893,7 @@ xkb_mod_mask_t XkbKeyboardLayoutEngine::EventFlagsToXkbFlags(
     if (ui_flags & entry.ui_flag)
       xkb_flags |= entry.xkb_flag;
   }
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   // In ChromeOS NumLock is always on.
   xkb_flags |= num_lock_mod_mask_;
 #endif

ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h

@@ -19,6 +19,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/task_runner.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/keycodes/scoped_xkb.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine.h"
 #include "ui/events/ozone/layout/xkb/xkb_key_code_converter.h"
@@ -75,7 +76,7 @@ class COMPONENT_EXPORT(EVENTS_OZONE_LAYOUT) XkbKeyboardLayoutEngine
   // kept.
   base::flat_map<uint32_t, uint32_t> xkb_keysym_map_;
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   // Flag mask for num lock, which is always considered enabled in ChromeOS.
   xkb_mod_mask_t num_lock_mod_mask_ = 0;
 #endif

ui/events/platform/x11/BUILD.gn

@@ -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("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 
@@ -33,11 +34,12 @@ component("x11") {
 
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//ui/base:features",
     "//ui/events/keycodes:x11",
   ]
 
-  if (is_chromeos) {
+  if (is_chromeos_ash) {
     deps += [ "//ui/events/ozone" ]
   }
 

ui/events/platform/x11/x11_event_source.cc

@@ -13,6 +13,7 @@
 #include "base/memory/free_deleter.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/metrics/histogram_macros.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/devices/x11/device_data_manager_x11.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 #include "ui/events/event_utils.h"
@@ -35,7 +36,7 @@
 #include "ui/events/platform/x11/x11_event_watcher_fdwatch.h"
 #endif
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "ui/events/ozone/chromeos/cursor_controller.h"
 #endif
 
@@ -323,7 +324,7 @@ void X11EventSource::ProcessXEvent(x11::Event* xevent) {
     return;
   }
   if (translated_event && translated_event->type() != ET_UNKNOWN) {
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
     if (translated_event->IsLocatedEvent()) {
       ui::CursorController::GetInstance()->SetCursorLocation(
           translated_event->AsLocatedEvent()->location_f());

ui/events/test/event_generator.cc

@@ -17,6 +17,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/tick_clock.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event.h"
 #include "ui/events/event_source.h"
 #include "ui/events/event_utils.h"
@@ -177,7 +178,7 @@ void EventGenerator::SendMouseExit() {
   Dispatch(&mouseev);
 }
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
 void EventGenerator::MoveMouseToWithNative(const gfx::Point& point_in_host,
                                            const gfx::Point& point_for_native) {
   // Ozone uses the location in native event as a system location.

ui/events/test/event_generator.h

@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/time/time.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/events/event.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -224,7 +225,7 @@ class EventGenerator {
     MoveMouseToInHost(gfx::Point(x, y));
   }
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   // Generates a mouse move event at the point given in the host
   // coordinates, with a native event with |point_for_natve|.
   void MoveMouseToWithNative(const gfx::Point& point_in_host,

ui/events/x/BUILD.gn

@@ -19,6 +19,7 @@ component("x") {
   defines = [ "EVENTS_X_IMPLEMENTATION" ]
   deps = [
     "//base",
+    "//build:chromeos_buildflags",
     "//skia",
     "//ui/base:features",
     "//ui/display",

ui/events/x/events_x_utils.cc

@@ -14,6 +14,7 @@
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
+#include "build/chromeos_buildflags.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
@@ -161,7 +162,7 @@ int GetEventFlagsFromXKeyEvent(const x11::Event& xev) {
   DCHECK(key);
   const auto state = static_cast<int>(key->state);
 
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
   const int ime_fabricated_flag = 0;
 #else
   // XIM fabricates key events for the character compositions by XK_Multi_key.
@@ -563,7 +564,7 @@ gfx::Point EventLocationFromXEvent(const x11::Event& xev) {
   if (auto* xievent = xev.As<x11::Input::DeviceEvent>()) {
     float x = Fp1616ToDouble(xievent->event_x);
     float y = Fp1616ToDouble(xievent->event_y);
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS_ASH)
     switch (xievent->opcode) {
       case x11::Input::DeviceEvent::TouchBegin:
       case x11::Input::DeviceEvent::TouchUpdate:
@@ -574,7 +575,7 @@ gfx::Point EventLocationFromXEvent(const x11::Event& xev) {
       default:
         break;
     }
-#endif  // defined(OS_CHROMEOS)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
     return gfx::Point(static_cast<int>(x), static_cast<int>(y));
   }
   return gfx::Point();