Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: extensions/common/features/complex_feature.cc

Issue 2201653003: Revert of Further reduction of feature_compiler.py generated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test-with-leiz
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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::vector<Feature*>* features) { 9 ComplexFeature::ComplexFeature(std::unique_ptr<FeatureList> features) {
10 DCHECK_GT(features->size(), 0UL); 10 DCHECK_GT(features->size(), 0UL);
11 for (Feature* f : *features) 11 features_.swap(*features);
12 features_.push_back(std::unique_ptr<Feature>(f));
13 features->clear();
14 no_parent_ = features_[0]->no_parent(); 12 no_parent_ = features_[0]->no_parent();
15 13
16 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) 14 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
17 // Verify IsInternal and no_parent is consistent across all features. 15 // Verify IsInternal and no_parent is consistent across all features.
18 bool first_is_internal = features_[0]->IsInternal(); 16 bool first_is_internal = features_[0]->IsInternal();
19 for (FeatureList::const_iterator it = features_.begin() + 1; 17 for (FeatureList::const_iterator it = features_.begin() + 1;
20 it != features_.end(); 18 it != features_.end();
21 ++it) { 19 ++it) {
22 DCHECK(first_is_internal == (*it)->IsInternal()) 20 DCHECK(first_is_internal == (*it)->IsInternal())
23 << "Complex feature must have consistent values of " 21 << "Complex feature must have consistent values of "
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 return false; 96 return false;
99 } 97 }
100 98
101 bool ComplexFeature::IsInternal() const { 99 bool ComplexFeature::IsInternal() const {
102 // Constructor verifies that composed features are consistent, thus we can 100 // Constructor verifies that composed features are consistent, thus we can
103 // return just the first feature's value. 101 // return just the first feature's value.
104 return features_[0]->IsInternal(); 102 return features_[0]->IsInternal();
105 } 103 }
106 104
107 } // namespace extensions 105 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/features/complex_feature.h ('k') | extensions/common/features/complex_feature_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698