Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: ui/views/BUILD.gn

Issue 1291703008: Rename is_chromeos in chrome/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: retry Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/resources/BUILD.gn ('k') | ui/views_content_client/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/BUILD.gn
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index ae64118d03f8e1bc2cb8269b81101268952474f8..86641a4e666170500b898f9b0751a9e148253eb6 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -55,10 +55,10 @@ component("views") {
"//ui/views/resources",
]
- if (use_x11 && !is_chromeos) {
+ if (use_x11 && !use_cros_fe) {
deps += [ "//ui/display/util" ]
}
- if (is_linux && !is_chromeos) {
+ if (is_linux && !use_cros_fe) {
sources -= [ "window/window_button_order_provider.cc" ]
deps += [ "//ui/shell_dialogs" ]
} else {
@@ -70,7 +70,7 @@ component("views") {
]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources -= [
"linux_ui/status_icon_linux.cc",
"linux_ui/status_icon_linux.h",
@@ -113,7 +113,7 @@ component("views") {
"//ui/touch_selection",
"//ui/wm",
]
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += gypi_values.views_desktop_aura_sources
if (use_x11) {
sources += gypi_values.views_desktop_aura_x11_sources
@@ -171,7 +171,7 @@ static_library("test_support") {
"//ui/aura:test_support",
"//ui/wm",
]
- if (use_x11 && !is_chromeos) {
+ if (use_x11 && !use_cros_fe) {
sources += gypi_values.views_test_support_desktop_aura_x11_sources
}
}
@@ -252,14 +252,14 @@ test("views_unittests") {
"//ui/touch_selection",
"//ui/wm",
]
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += gypi_values.views_unittests_desktop_aura_sources
if (use_x11) {
sources += gypi_values.views_unittests_desktop_aurax11_sources
}
}
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += gypi_values.views_unittests_desktop_sources
}
if (use_x11) {
« no previous file with comments | « ui/resources/BUILD.gn ('k') | ui/views_content_client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698