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

Unified Diff: build/config/ui.gni

Issue 1283313004: Rename is_chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweak use of flag in ui.gni 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 | « build/config/features.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index ca2f26521fc504148d344d6845845b3cfec42999..6420fc773df7d4c699a50bd77354cd90f285dc5f 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -14,6 +14,8 @@
# required. See the declare_args block of BUILDCONFIG.gn for advice on how
# to set up feature flags.
+import("//build/config/features.gni")
+
declare_args() {
# Indicates if Ash is enabled. Ash is the Aura Shell which provides a
# desktop-like environment for Aura. Requires use_aura = true
@@ -31,7 +33,7 @@ declare_args() {
use_aura = is_win || is_linux
# True means the UI is built using the "views" framework.
- toolkit_views = is_mac || is_win || is_chromeos || use_aura
+ toolkit_views = is_mac || is_win || use_cros_fe || use_aura
# Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
mac_views_browser = false
@@ -70,4 +72,4 @@ use_clipboard_aurax11 = is_linux && use_aura && use_x11
enable_hidpi = is_mac || is_win || is_linux
-enable_topchrome_md = is_chromeos || is_win || is_linux
+enable_topchrome_md = use_cros_fe || is_win || is_linux
« no previous file with comments | « build/config/features.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698