| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "chrome/common/chrome_features.h" | 5 #include "chrome/common/chrome_features.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
| 9 #include "extensions/features/features.h" | 9 #include "extensions/features/features.h" |
| 10 #include "ppapi/features/features.h" | 10 #include "ppapi/features/features.h" |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 "MaterialDesignExtensions", base::FEATURE_DISABLED_BY_DEFAULT}; | 198 "MaterialDesignExtensions", base::FEATURE_DISABLED_BY_DEFAULT}; |
| 199 | 199 |
| 200 // Sets whether dismissing the new-tab-page override bubble counts as | 200 // Sets whether dismissing the new-tab-page override bubble counts as |
| 201 // acknowledgement. | 201 // acknowledgement. |
| 202 extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate{ | 202 extern const base::Feature kAcknowledgeNtpOverrideOnDeactivate{ |
| 203 "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT}; | 203 "AcknowledgeNtpOverrideOnDeactivate", base::FEATURE_DISABLED_BY_DEFAULT}; |
| 204 #endif | 204 #endif |
| 205 | 205 |
| 206 // The material redesign of the Incognito NTP. | 206 // The material redesign of the Incognito NTP. |
| 207 const base::Feature kMaterialDesignIncognitoNTP{ | 207 const base::Feature kMaterialDesignIncognitoNTP{ |
| 208 "MaterialDesignIncognitoNTP", base::FEATURE_DISABLED_BY_DEFAULT}; | 208 "MaterialDesignIncognitoNTP", |
| 209 #if defined(OS_ANDROID) |
| 210 base::FEATURE_DISABLED_BY_DEFAULT |
| 211 #else |
| 212 base::FEATURE_ENABLED_BY_DEFAULT |
| 213 #endif |
| 214 }; |
| 209 | 215 |
| 210 // Enables or disables the Material Design version of chrome://settings. | 216 // Enables or disables the Material Design version of chrome://settings. |
| 211 // Also affects chrome://help. | 217 // Also affects chrome://help. |
| 212 const base::Feature kMaterialDesignSettings{"MaterialDesignSettings", | 218 const base::Feature kMaterialDesignSettings{"MaterialDesignSettings", |
| 213 base::FEATURE_ENABLED_BY_DEFAULT}; | 219 base::FEATURE_ENABLED_BY_DEFAULT}; |
| 214 | 220 |
| 215 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 221 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 216 // Enables media content bitstream remoting, an optimization that can activate | 222 // Enables media content bitstream remoting, an optimization that can activate |
| 217 // during Cast Tab Mirroring. | 223 // during Cast Tab Mirroring. |
| 218 const base::Feature kMediaRemoting{"MediaRemoting", | 224 const base::Feature kMediaRemoting{"MediaRemoting", |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 return base::FeatureList::IsEnabled(features::kPrefService) || | 386 return base::FeatureList::IsEnabled(features::kPrefService) || |
| 381 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) | 387 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES) |
| 382 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 388 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| 383 switches::kMusConfig) == switches::kMash; | 389 switches::kMusConfig) == switches::kMash; |
| 384 #else | 390 #else |
| 385 false; | 391 false; |
| 386 #endif | 392 #endif |
| 387 } | 393 } |
| 388 | 394 |
| 389 } // namespace features | 395 } // namespace features |
| OLD | NEW |