| Index: chrome/common/features.gni
|
| diff --git a/chrome/common/features.gni b/chrome/common/features.gni
|
| index 0c2e335dd810f4c21145e43babbdfb3b5427de5b..b05a9ee43858ac6abbcd7529e63201691012a220 100644
|
| --- a/chrome/common/features.gni
|
| +++ b/chrome/common/features.gni
|
| @@ -22,10 +22,16 @@ declare_args() {
|
| # and have a system dialog.
|
| enable_basic_print_dialog = enable_basic_printing && !is_chromeos
|
|
|
| + enable_captive_portal_detection = !is_android && !is_ios && !is_chromecast
|
| +
|
| # Google Now is disabled to prepare for its removal.
|
| # http://crbug.com/539674
|
| enable_google_now = false
|
|
|
| + # Hangout services is an extension that adds extra features to Hangouts.
|
| + # For official Chrome builds, this flag is set on the bots.
|
| + enable_hangout_services_extension = false
|
| +
|
| # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
|
| # will download a closed-source NaCl module at startup.) Chrome-branded
|
| # ChromeOS builds have this enabled by default.
|
| @@ -38,6 +44,8 @@ declare_args() {
|
| # Specify --mash to chrome to have chrome start the mash environment.
|
| enable_package_mash_services = is_chromeos
|
|
|
| + enable_plugin_installation = is_win || is_mac
|
| +
|
| enable_service_discovery = enable_mdns || is_mac
|
|
|
| # Enables vr shell.
|
|
|