| Index: ui/base/BUILD.gn
|
| diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
|
| index 15ad86c835b844328f628e0acf325ae16b329a6b..cf474233e05e0ca8c1392c713003593b0050618b 100644
|
| --- a/ui/base/BUILD.gn
|
| +++ b/ui/base/BUILD.gn
|
| @@ -365,7 +365,7 @@ component("base") {
|
| "x/x11_util.h",
|
| "x/x11_util_internal.h",
|
| ]
|
| - if (!is_chromeos) {
|
| + if (!is_chromeos_ui) {
|
| sources += [
|
| "idle/idle_query_x11.cc",
|
| "idle/idle_query_x11.h",
|
| @@ -392,7 +392,7 @@ component("base") {
|
| ]
|
| }
|
|
|
| - if ((is_linux && !is_chromeos) || is_chromeos) {
|
| + if ((is_linux && !is_chromeos_ui) || is_chromeos_ui) {
|
| if (!toolkit_views && !use_aura) {
|
| sources -= [
|
| "dragdrop/drag_utils.cc",
|
| @@ -401,12 +401,12 @@ component("base") {
|
| }
|
| }
|
|
|
| - if (is_chromeos) {
|
| + if (is_chromeos_ui) {
|
| deps += [ "//chromeos" ]
|
| sources -= [ "idle/idle_linux.cc" ]
|
| }
|
|
|
| - if (is_chromeos || (use_aura && ((is_linux && !use_x11) || is_android))) {
|
| + if (is_chromeos_ui || (use_aura && ((is_linux && !use_x11) || is_android))) {
|
| sources += [
|
| "dragdrop/os_exchange_data_provider_aura.cc",
|
| "dragdrop/os_exchange_data_provider_aura.h",
|
| @@ -478,7 +478,7 @@ component("base") {
|
| "cursor/cursor_loader_x11.h",
|
| "cursor/cursor_x11.cc",
|
| ]
|
| - if (!is_chromeos) {
|
| + if (!is_chromeos_ui) {
|
| # These Aura X11 files aren't used on ChromeOS.
|
| sources += [
|
| "dragdrop/os_exchange_data_provider_aurax11.cc",
|
| @@ -713,13 +713,13 @@ test("ui_base_unittests") {
|
| "ime/win/imm32_manager_unittest.cc",
|
| "ime/win/tsf_input_scope_unittest.cc",
|
| ]
|
| - if (is_linux && use_aura && !is_chromeos) {
|
| + if (is_linux && use_aura && !is_chromeos_ui) {
|
| sources += [ "ime/input_method_auralinux_unittest.cc" ]
|
| }
|
| if (use_x11) {
|
| sources += [ "ime/composition_text_util_pango_unittest.cc" ]
|
| }
|
| - if (!use_x11 && is_chromeos) {
|
| + if (!use_x11 && is_chromeos_ui) {
|
| # These were already removed in the non-chromeos case.
|
| sources -= [ "ime/input_method_chromeos_unittest.cc" ]
|
| }
|
| @@ -817,14 +817,14 @@ test("ui_base_unittests") {
|
| ]
|
| }
|
|
|
| - if (use_x11 && !is_chromeos) {
|
| + if (use_x11 && !is_chromeos_ui) {
|
| sources += [
|
| "dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
|
| "x/selection_requestor_unittest.cc",
|
| ]
|
| }
|
|
|
| - if (is_chromeos) {
|
| + if (is_chromeos_ui) {
|
| deps += [
|
| "//chromeos",
|
| "//ui/events:dom_keycode_converter",
|
|
|