Chromium Code Reviews| Index: base/feature_list.h |
| diff --git a/base/feature_list.h b/base/feature_list.h |
| index 80209ba6588464d769d48215d4ffc54f23d6ac3b..79ed88c364bf677966f94bade8d9645b1bcf01fb 100644 |
| --- a/base/feature_list.h |
| +++ b/base/feature_list.h |
| @@ -13,6 +13,7 @@ |
| #include "base/base_export.h" |
| #include "base/gtest_prod_util.h" |
| #include "base/macros.h" |
| +#include "base/metrics/persistent_memory_allocator.h" |
| #include "base/strings/string_piece.h" |
| #include "base/synchronization/lock.h" |
| @@ -92,6 +93,8 @@ class BASE_EXPORT FeatureList { |
| void InitializeFromCommandLine(const std::string& enable_features, |
| const std::string& disable_features); |
| + void InitializeFromSharedMemory(SharedPersistentMemoryAllocator* allocator); |
|
lawrencewu
2016/12/01 02:39:48
Write a docstring for this. Also maybe typedef Sha
lawrencewu
2016/12/01 18:47:11
We also need to enforce disabled features over ena
|
| + |
| // Specifies whether a feature override enables or disables the feature. |
| enum OverrideState { |
| OVERRIDE_USE_DEFAULT, |
| @@ -124,6 +127,8 @@ class BASE_EXPORT FeatureList { |
| OverrideState override_state, |
| FieldTrial* field_trial); |
| + void AddFeaturesToAllocator(SharedPersistentMemoryAllocator* allocator); |
|
lawrencewu
2016/12/01 02:39:48
Write docstring.
lawrencewu
2016/12/01 18:47:11
Done.
|
| + |
| // Returns comma-separated lists of feature names (in the same format that is |
| // accepted by InitializeFromCommandLine()) corresponding to features that |
| // have been overridden - either through command-line or via FieldTrials. For |
| @@ -180,6 +185,7 @@ class BASE_EXPORT FeatureList { |
| private: |
| FRIEND_TEST_ALL_PREFIXES(FeatureListTest, CheckFeatureIdentity); |
| + friend class FieldTrialList; |
|
lawrencewu
2016/12/01 02:39:48
Do we actually need this?
lawrencewu
2016/12/01 18:47:11
Don't think so -- removed.
|
| struct OverrideEntry { |
| // The overridden enable (on/off) state of the feature. |