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 #include "extensions/common/features/complex_feature.h" | 5 #include "extensions/common/features/complex_feature.h" |
6 | 6 |
7 namespace extensions { | 7 namespace extensions { |
8 | 8 |
9 ComplexFeature::ComplexFeature(std::unique_ptr<FeatureList> features) { | 9 ComplexFeature::ComplexFeature(std::vector<Feature*>* features) { |
10 DCHECK_GT(features->size(), 0UL); | 10 DCHECK_GT(features->size(), 0UL); |
11 features_.swap(*features); | 11 for (Feature* f : *features) |
| 12 features_.push_back(std::unique_ptr<Feature>(f)); |
| 13 features->clear(); |
12 no_parent_ = features_[0]->no_parent(); | 14 no_parent_ = features_[0]->no_parent(); |
13 | 15 |
14 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) | 16 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) |
15 // Verify IsInternal and no_parent is consistent across all features. | 17 // Verify IsInternal and no_parent is consistent across all features. |
16 bool first_is_internal = features_[0]->IsInternal(); | 18 bool first_is_internal = features_[0]->IsInternal(); |
17 for (FeatureList::const_iterator it = features_.begin() + 1; | 19 for (FeatureList::const_iterator it = features_.begin() + 1; |
18 it != features_.end(); | 20 it != features_.end(); |
19 ++it) { | 21 ++it) { |
20 DCHECK(first_is_internal == (*it)->IsInternal()) | 22 DCHECK(first_is_internal == (*it)->IsInternal()) |
21 << "Complex feature must have consistent values of " | 23 << "Complex feature must have consistent values of " |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 return false; | 98 return false; |
97 } | 99 } |
98 | 100 |
99 bool ComplexFeature::IsInternal() const { | 101 bool ComplexFeature::IsInternal() const { |
100 // Constructor verifies that composed features are consistent, thus we can | 102 // Constructor verifies that composed features are consistent, thus we can |
101 // return just the first feature's value. | 103 // return just the first feature's value. |
102 return features_[0]->IsInternal(); | 104 return features_[0]->IsInternal(); |
103 } | 105 } |
104 | 106 |
105 } // namespace extensions | 107 } // namespace extensions |
OLD | NEW |