| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 } else if (is_ios) { | 114 } else if (is_ios) { |
| 115 safe_browsing_mode = 0 | 115 safe_browsing_mode = 0 |
| 116 } else { | 116 } else { |
| 117 safe_browsing_mode = 1 | 117 safe_browsing_mode = 1 |
| 118 } | 118 } |
| 119 | 119 |
| 120 # Set to true make a build that disables activation of field trial tests | 120 # Set to true make a build that disables activation of field trial tests |
| 121 # specified in testing/variations/fieldtrial_testing_config_*.json. | 121 # specified in testing/variations/fieldtrial_testing_config_*.json. |
| 122 # Note: this setting is ignored if is_chrome_branded. | 122 # Note: this setting is ignored if is_chrome_branded. |
| 123 fieldtrial_testing_like_official_build = is_chrome_branded | 123 fieldtrial_testing_like_official_build = is_chrome_branded |
| 124 |
| 125 # Use Chrome's implementation of the Mojo EDK located in src/mojo/edk instead |
| 126 # of the one in src/third_party/mojo/src/mojo/edk |
| 127 use_chrome_edk = false |
| 124 } | 128 } |
| 125 | 129 |
| 126 # Additional dependent variables ----------------------------------------------- | 130 # Additional dependent variables ----------------------------------------------- |
| 127 | 131 |
| 128 # Set the version of CLD. | 132 # Set the version of CLD. |
| 129 # 1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1. | 133 # 1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1. |
| 130 # 2: Use only CLD2. | 134 # 2: Use only CLD2. |
| 131 cld_version = 2 | 135 cld_version = 2 |
| 132 | 136 |
| 133 if (is_android || is_ios) { | 137 if (is_android || is_ios) { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 # system). | 210 # system). |
| 207 # TODO(GYP) also require !embedded to enable. | 211 # TODO(GYP) also require !embedded to enable. |
| 208 use_gconf = is_linux && !is_chromeos | 212 use_gconf = is_linux && !is_chromeos |
| 209 | 213 |
| 210 # Whether to back up data before sync. | 214 # Whether to back up data before sync. |
| 211 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) | 215 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos) |
| 212 | 216 |
| 213 # Enable WebVR support by default on Android | 217 # Enable WebVR support by default on Android |
| 214 # Still requires command line flag to access API | 218 # Still requires command line flag to access API |
| 215 enable_webvr = is_android | 219 enable_webvr = is_android |
| OLD | NEW |