| Index: build/config/features.gni
|
| diff --git a/build/config/features.gni b/build/config/features.gni
|
| index 8ca446dd43d9386c52977656d591e4820d447bdc..4d97ece902fe78f4f5a6e4ad5e113f9a24f696f3 100644
|
| --- a/build/config/features.gni
|
| +++ b/build/config/features.gni
|
| @@ -36,7 +36,7 @@ declare_args() {
|
| # the commented out logic.
|
| # Eventually we want this to be:
|
| # enable_nacl = !is_ios && !is_android
|
| - enable_nacl = (is_linux && !is_chromeos && current_cpu == "x64") || is_nacl
|
| + enable_nacl = (is_linux && !is_chromeos_ui && current_cpu == "x64") || is_nacl
|
| enable_nacl_untrusted = enable_nacl
|
| enable_pnacl = enable_nacl_untrusted
|
|
|
| @@ -82,7 +82,7 @@ declare_args() {
|
|
|
| enable_google_now = !is_ios && !is_android
|
|
|
| - enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
|
| + enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos_ui)
|
|
|
| enable_remoting = !is_ios && !is_android
|
|
|
| @@ -139,7 +139,7 @@ enable_spellcheck = !is_ios
|
| use_browser_spellchecker = is_android || is_mac
|
|
|
| # Enable basic printing support and UI.
|
| -enable_basic_printing = !is_chromeos
|
| +enable_basic_printing = !is_chromeos_ui
|
|
|
| # Enable printing with print preview. It does not imply
|
| # enable_basic_printing. It's possible to build Chrome with preview only.
|
| @@ -176,29 +176,29 @@ win_pdf_metafile_for_printing = true
|
|
|
| # Whether we are using the rlz library or not. Platforms like Android send
|
| # rlz codes for searches but do not use the library.
|
| -enable_rlz_support = is_win || is_mac || is_ios || is_chromeos
|
| +enable_rlz_support = is_win || is_mac || is_ios || is_chromeos_ui
|
| enable_rlz = is_chrome_branded && enable_rlz_support
|
|
|
| -enable_settings_app = enable_app_list && !is_chromeos
|
| +enable_settings_app = enable_app_list && !is_chromeos_ui
|
|
|
| enable_service_discovery = enable_mdns || is_mac
|
|
|
| enable_wifi_bootstrapping = is_win || is_mac
|
|
|
| # Image loader extension is enabled on ChromeOS only.
|
| -enable_image_loader_extension = is_chromeos
|
| +enable_image_loader_extension = is_chromeos_ui
|
|
|
| # Chrome OS: whether to also build the upcoming version of
|
| # ChromeVox, which can then be enabled via a command-line switch.
|
| enable_chromevox_next = false
|
|
|
| # Use brlapi from brltty for braille display support.
|
| -use_brlapi = is_chromeos
|
| +use_brlapi = is_chromeos_ui
|
|
|
| # Option controlling the use of GConf (the classic GNOME configuration
|
| # system).
|
| # TODO(GYP) also require !embedded to enable.
|
| -use_gconf = is_linux && !is_chromeos
|
| +use_gconf = is_linux && !is_chromeos_ui
|
|
|
| # Hangout services is an extension that adds extra features to Hangouts.
|
| # For official GYP builds, this flag is set, it will likely need to be
|
| @@ -206,7 +206,7 @@ use_gconf = is_linux && !is_chromeos
|
| enable_hangout_services_extension = false
|
|
|
| # Whether to back up data before sync.
|
| -enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
|
| +enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos_ui)
|
|
|
| # WebVR support disabled until platform implementations have been added
|
| enable_webvr = false
|
|
|