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

Unified Diff: chrome/browser/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/app/resources/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 3136887e63f9115f98662ba5bde7fe3d6fc2e142..693d7a9797037ae7689f9f5cc67aa3e1f566882f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -347,7 +347,7 @@ source_set("browser") {
if (!is_win && !is_mac && !is_ios) {
sources += [ "net/net_error_diagnostics_dialog_generic.cc" ]
}
- if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) {
+ if (!is_android && !is_ios && !use_cros_fe && enable_configuration_policy) {
sources += [
"net/disk_cache_dir_policy_handler.cc",
"net/disk_cache_dir_policy_handler.h",
@@ -387,7 +387,7 @@ source_set("browser") {
sources += rebase_path(gypi_values.chrome_browser_background_sources,
".",
"//chrome")
- if (!use_aura || is_win || is_chromeos) {
+ if (!use_aura || is_win || use_cros_fe) {
sources -= [ "background/background_mode_manager_aura.cc" ]
}
}
@@ -424,7 +424,7 @@ source_set("browser") {
".",
"//chrome")
}
- if (!is_chromeos) {
+ if (!use_cros_fe) {
sources += rebase_path(
gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources,
".",
@@ -495,11 +495,11 @@ source_set("browser") {
"//device/udev_linux",
]
}
- if (is_linux && !is_chromeos) {
+ if (is_linux && !use_cros_fe) {
deps += [ "//third_party/speech-dispatcher" ]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += rebase_path(gypi_values.chrome_browser_chromeos_sources,
".",
"//chrome")
@@ -518,7 +518,7 @@ source_set("browser") {
]
}
- if (is_chromeos || is_ios) {
+ if (use_cros_fe || is_ios) {
sources -= [
"metrics/signin_status_metrics_provider.cc",
"metrics/signin_status_metrics_provider.h",
@@ -577,7 +577,7 @@ source_set("browser") {
if (use_nss_certs) {
sources +=
rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome")
- if (is_chromeos) {
+ if (use_cros_fe) {
sources -= [ "net/nss_context_linux.cc" ]
}
}
@@ -636,7 +636,7 @@ source_set("browser") {
"//chrome")
}
- if (!is_android && !is_ios && !is_chromeos) {
+ if (!is_android && !is_ios && !use_cros_fe) {
sources +=
rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
}
@@ -1100,7 +1100,7 @@ source_set("test_support") {
deps += [ "//extensions:test_support" ]
}
- if (is_chromeos) {
+ if (use_cros_fe) {
sources += [
"chromeos/app_mode/fake_cws.cc",
"chromeos/app_mode/fake_cws.h",
« no previous file with comments | « chrome/app/resources/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698