Index: build/config/ui.gni |
diff --git a/build/config/ui.gni b/build/config/ui.gni |
index f7070bbf46af9103f4c96ffe239ad423e521e748..9a2d583bbe4d0c4a6b974bc63b28ccc9f5f4037c 100644 |
--- a/build/config/ui.gni |
+++ b/build/config/ui.gni |
@@ -15,24 +15,25 @@ |
# to set up feature flags. |
import("//build/config/chromecast_build.gni") |
+import("//build/config/headless_build.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 |
- use_ash = (is_win || is_linux) && !is_chromecast |
+ use_ash = (is_win || is_linux) && !is_chromecast && !is_headless |
jam
2015/10/26 17:05:31
curious, why?
Sami
2015/10/26 18:09:06
Is there a reason why we'd want to have a full des
jam
2015/10/30 16:15:49
good point, ok
|
# Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux |
# that does not require X11. Enabling this feature disables use of glib, x11, |
# Pango, and Cairo. Default to false on non-Chromecast builds. |
- use_ozone = is_chromecast && !is_android |
+ use_ozone = (is_chromecast || is_headless) && !is_android |
# Indicates if Aura is enabled. Aura is a low-level windowing library, sort |
# of a replacement for GDI or GTK. |
- use_aura = is_win || is_linux || is_chromecast |
+ use_aura = is_win || is_linux || is_chromecast || is_headless |
jam
2015/10/26 17:05:31
is this really necessary? i.e. you're targeting li
Sami
2015/10/26 18:09:06
Yes, but don't you need to enable Aura to be able
jam
2015/10/30 16:15:49
if so, then this should key off ozone. but ozone i
Sami
2015/11/05 19:08:17
Ah, got it, is_linux should be enough. Removed.
|
# True means the UI is built using the "views" framework. |
- toolkit_views = |
- (is_mac || is_win || is_chromeos || use_aura) && !is_chromecast |
+ toolkit_views = (is_mac || is_win || is_chromeos || use_aura) && |
+ !is_chromecast && !is_headless |
jam
2015/10/26 17:05:31
curious why?
Sami
2015/10/26 18:09:06
Similarly to disabling ash, this gets rid of brows
jam
2015/10/30 16:15:49
if the ui isn't built using views, then which tool
Sami
2015/11/05 19:08:17
We've explored this a little more now and I think
|
# Whether the entire browser uses toolkit-views on Mac instead of Cocoa. |
mac_views_browser = false |