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

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: 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 b13909c6d50c961ee97f9cfd645627d81d6214a9..7ecfcde5f5f0aadbbdc16da57f8e810232729c5c 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -163,7 +163,7 @@ source_set("ui") {
"//chrome/browser/safe_browsing:report_proto",
]
}
- if (is_chromeos) {
+ if (is_chromeos_ui) {
sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_sources,
".",
"//chrome")
@@ -185,7 +185,7 @@ source_set("ui") {
"//ash/strings",
"//components/user_manager",
]
- if (!is_chromeos) {
+ if (!is_chromeos_ui) {
sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
".",
"//chrome")
@@ -205,7 +205,7 @@ source_set("ui") {
deps += [ "//extensions/components/native_app_window" ]
}
- if (!is_chromeos && (!is_mac || mac_views_browser)) {
+ if (!is_chromeos_ui && (!is_mac || mac_views_browser)) {
sources +=
rebase_path(gypi_values.chrome_browser_ui_views_non_chromeos_sources,
".",
@@ -222,7 +222,7 @@ source_set("ui") {
".",
"//chrome")
}
- if (is_chromeos) {
+ if (is_chromeos_ui) {
# TODO(GYP): crbug.com/481629. These files should probably not be
# a part of ui_views_non_mac_sources at all.
sources -= [
@@ -264,7 +264,7 @@ source_set("ui") {
"//ui/keyboard:resources",
"//ui/wm",
]
- if (!is_chromeos) {
+ if (!is_chromeos_ui) {
sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos,
".",
"//chrome")
@@ -398,7 +398,7 @@ source_set("ui") {
"//chrome")
configs += [ "//build/config/linux:x11" ]
deps += [ "//ui/events/devices" ]
- if (is_chromeos) {
+ if (is_chromeos_ui) {
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