| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file contains Chrome-feature-related build flags (see ui.gni for | 5 # This file contains Chrome-feature-related build flags (see ui.gni for |
| 6 # UI-related ones). These should theoretically be moved to the build files of | 6 # UI-related ones). These should theoretically be moved to the build files of |
| 7 # the features themselves. | 7 # the features themselves. |
| 8 # | 8 # |
| 9 # However, today we have many "bad" dependencies on some of these flags from, | 9 # However, today we have many "bad" dependencies on some of these flags from, |
| 10 # e.g. base, so they need to be global to match the GYP configuration. Also, | 10 # e.g. base, so they need to be global to match the GYP configuration. Also, |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } else { | 108 } else { |
| 109 safe_browsing_mode = 1 | 109 safe_browsing_mode = 1 |
| 110 } | 110 } |
| 111 | 111 |
| 112 # Set to true make a build that disables activation of field trial tests | 112 # Set to true make a build that disables activation of field trial tests |
| 113 # specified in testing/variations/fieldtrial_testing_config_*.json. | 113 # specified in testing/variations/fieldtrial_testing_config_*.json. |
| 114 # Note: this setting is ignored if is_chrome_branded. | 114 # Note: this setting is ignored if is_chrome_branded. |
| 115 fieldtrial_testing_like_official_build = is_chrome_branded | 115 fieldtrial_testing_like_official_build = is_chrome_branded |
| 116 | 116 |
| 117 use_cups = (is_desktop_linux || is_mac) && !is_chromecast && !is_headless | 117 use_cups = (is_desktop_linux || is_mac) && !is_chromecast && !is_headless |
| 118 |
| 119 # Enables Wi-Fi Display functionality |
| 120 enable_wifi_display = false |
| 118 } | 121 } |
| 119 | 122 |
| 120 # Default these based on the explicit value of enable_nacl, not just | 123 # Default these based on the explicit value of enable_nacl, not just |
| 121 # the default value seen inside the declare_args() context. | 124 # the default value seen inside the declare_args() context. |
| 122 if (enable_nacl_untrusted == "") { | 125 if (enable_nacl_untrusted == "") { |
| 123 enable_nacl_untrusted = enable_nacl | 126 enable_nacl_untrusted = enable_nacl |
| 124 } | 127 } |
| 125 if (enable_pnacl == "") { | 128 if (enable_pnacl == "") { |
| 126 enable_pnacl = enable_nacl | 129 enable_pnacl = enable_nacl |
| 127 } | 130 } |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 | 200 |
| 198 # Option controlling the use of GConf (the classic GNOME configuration | 201 # Option controlling the use of GConf (the classic GNOME configuration |
| 199 # system). | 202 # system). |
| 200 use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless | 203 use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless |
| 201 | 204 |
| 202 # Enable WebVR support by default on Android | 205 # Enable WebVR support by default on Android |
| 203 # Still requires command line flag to access API | 206 # Still requires command line flag to access API |
| 204 enable_webvr = is_android | 207 enable_webvr = is_android |
| 205 | 208 |
| 206 use_gio = is_desktop_linux && !is_headless | 209 use_gio = is_desktop_linux && !is_headless |
| OLD | NEW |