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

Unified Diff: chrome/browser/ui/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 | « chrome/browser/resources/chromeos/chromevox/chromevox.gni ('k') | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 089a8682c71d6a3cd8262855fcb7d9308e1a676d..dbd7f8a8c8f700571a72d128dc92ad5a10c28ead 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -164,14 +164,14 @@ source_set("ui") {
]
}
- if (is_chromeos && !is_official_build) {
+ if (use_cros_fe && !is_official_build) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_chromeos_non_official_sources,
".",
"//chrome")
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_sources,
".",
"//chrome")
@@ -193,7 +193,7 @@ source_set("ui") {
"//ash/strings",
"//components/user_manager",
]
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
".",
"//chrome")
@@ -213,7 +213,7 @@ source_set("ui") {
deps += [ "//extensions/components/native_app_window" ]
}
- if (!is_chromeos && (!is_mac || mac_views_browser)) {
+ if (!use_cros_fe && (!is_mac || mac_views_browser)) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources,
".",
@@ -262,7 +262,7 @@ source_set("ui") {
"//ui/keyboard:resources",
"//ui/wm",
]
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos,
".",
"//chrome")
@@ -396,7 +396,7 @@ source_set("ui") {
"//chrome")
configs += [ "//build/config/linux:x11" ]
deps += [ "//ui/events/devices" ]
- if (is_chromeos) {
+ if (use_cros_fe) {
sources -= [ "views/tabs/window_finder_x11.cc" ]
}
}
« no previous file with comments | « chrome/browser/resources/chromeos/chromevox/chromevox.gni ('k') | chrome/chrome_repack_locales.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698