diff options
| author | limasdf <limasdf@gmail.com> | 2015-11-13 14:16:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 22:17:09 +0000 |
| commit | 6ca2e3c43a9b03699b6858b4ed424312a22db107 (patch) | |
| tree | 637367b7c4c525e8fc74c9dfd77777b38cf9834b /extensions/common/features | |
| parent | c8726de85c7d5e4855fc5db9c7e380273cae4477 (diff) | |
| download | chromium_src-6ca2e3c43a9b03699b6858b4ed424312a22db107.zip chromium_src-6ca2e3c43a9b03699b6858b4ed424312a22db107.tar.gz chromium_src-6ca2e3c43a9b03699b6858b4ed424312a22db107.tar.bz2 | |
Remove ScopedVector from /extenisons part#1
C++ 11 enables containers that contain move-only type, scoped_ptr.
So, Use std::vector<scoped_ptr<Foo>> instead of ScopedVector.
BUG=554289
TEST=none
Review URL: https://codereview.chromium.org/1445543002
Cr-Commit-Position: refs/heads/master@{#359663}
Diffstat (limited to 'extensions/common/features')
| -rw-r--r-- | extensions/common/features/complex_feature.h | 5 | ||||
| -rw-r--r-- | extensions/common/features/simple_feature.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extensions/common/features/complex_feature.h b/extensions/common/features/complex_feature.h index 2762805..663b1e77 100644 --- a/extensions/common/features/complex_feature.h +++ b/extensions/common/features/complex_feature.h @@ -7,8 +7,9 @@ #include <set> #include <string> +#include <vector> -#include "base/memory/scoped_vector.h" +#include "base/memory/scoped_ptr.h" #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/manifest.h" @@ -20,7 +21,7 @@ namespace extensions { // available, but not if only some combination of Features is available. class ComplexFeature : public Feature { public: - typedef ScopedVector<Feature> FeatureList; + using FeatureList = std::vector<scoped_ptr<Feature>>; explicit ComplexFeature(scoped_ptr<FeatureList> features); ~ComplexFeature() override; diff --git a/extensions/common/features/simple_feature.h b/extensions/common/features/simple_feature.h index 5ec95cf..f69e658 100644 --- a/extensions/common/features/simple_feature.h +++ b/extensions/common/features/simple_feature.h @@ -13,7 +13,6 @@ #include "base/gtest_prod_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_vector.h" #include "base/values.h" #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" @@ -203,7 +202,7 @@ class SimpleFeature : public Feature { bool component_extensions_auto_granted_; std::string command_line_switch_; - ScopedVector<SimpleFeatureFilter> filters_;; + std::vector<scoped_ptr<SimpleFeatureFilter>> filters_; DISALLOW_COPY_AND_ASSIGN(SimpleFeature); }; |