| 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 # ============================================= | 5 # ============================================= |
| 6 # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE | 6 # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE |
| 7 # ============================================= | 7 # ============================================= |
| 8 # | 8 # |
| 9 # These flags are effectively global. Your feature flag should go near the | 9 # These flags are effectively global. Your feature flag should go near the |
| 10 # code it controls. Most of these items are here now because they control | 10 # code it controls. Most of these items are here now because they control |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 enable_media_router = !is_ios && !is_chromecast | 50 enable_media_router = !is_ios && !is_chromecast |
| 51 | 51 |
| 52 # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. | 52 # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4. |
| 53 # We always build Google Chrome and Chromecast with proprietary codecs. | 53 # We always build Google Chrome and Chromecast with proprietary codecs. |
| 54 proprietary_codecs = is_chrome_branded || is_chromecast | 54 proprietary_codecs = is_chrome_branded || is_chromecast |
| 55 | 55 |
| 56 # Enables use of the session service, which is enabled by default. | 56 # Enables use of the session service, which is enabled by default. |
| 57 # Android stores them separately on the Java side. | 57 # Android stores them separately on the Java side. |
| 58 enable_session_service = !is_android && !is_ios && !is_chromecast | 58 enable_session_service = !is_android && !is_ios && !is_chromecast |
| 59 | 59 |
| 60 enable_app_list = is_chromeos | |
| 61 | |
| 62 enable_supervised_users = !is_ios && !is_chromecast | 60 enable_supervised_users = !is_ios && !is_chromecast |
| 63 | 61 |
| 64 # Variable safe_browsing is used to control the build time configuration for | 62 # Variable safe_browsing is used to control the build time configuration for |
| 65 # safe browsing feature. Safe browsing can be compiled in 3 different levels: | 63 # safe browsing feature. Safe browsing can be compiled in 3 different levels: |
| 66 # 0 disables it, 1 enables it fully, and 2 enables mobile protection via an | 64 # 0 disables it, 1 enables it fully, and 2 enables mobile protection via an |
| 67 # external API. | 65 # external API. |
| 68 if (is_ios || is_chromecast) { | 66 if (is_ios || is_chromecast) { |
| 69 safe_browsing_mode = 0 | 67 safe_browsing_mode = 0 |
| 70 } else if (is_android) { | 68 } else if (is_android) { |
| 71 safe_browsing_mode = 2 | 69 safe_browsing_mode = 2 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 | 156 |
| 159 enable_configuration_policy = !is_ios | 157 enable_configuration_policy = !is_ios |
| 160 | 158 |
| 161 enable_mac_keystone = is_mac && is_chrome_branded && is_official_build | 159 enable_mac_keystone = is_mac && is_chrome_branded && is_official_build |
| 162 # | 160 # |
| 163 # ============================================= | 161 # ============================================= |
| 164 # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE | 162 # PLEASE DO NOT ADD MORE FLAGS TO THIS FILE |
| 165 # ============================================= | 163 # ============================================= |
| 166 # | 164 # |
| 167 # See comment at the top. | 165 # See comment at the top. |
| OLD | NEW |