| 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 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 5 #ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
| 6 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 6 #define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> |
| 10 #include <set> | 11 #include <set> |
| 11 #include <string> | 12 #include <string> |
| 12 | 13 |
| 13 #include "base/json/json_writer.h" | 14 #include "base/json/json_writer.h" |
| 14 #include "base/memory/scoped_ptr.h" | |
| 15 #include "base/values.h" | 15 #include "base/values.h" |
| 16 #include "extensions/common/extension_messages.h" | 16 #include "extensions/common/extension_messages.h" |
| 17 #include "extensions/common/permissions/api_permission.h" | 17 #include "extensions/common/permissions/api_permission.h" |
| 18 #include "ipc/ipc_message.h" | 18 #include "ipc/ipc_message.h" |
| 19 #include "ipc/ipc_message_utils.h" | 19 #include "ipc/ipc_message_utils.h" |
| 20 | 20 |
| 21 namespace extensions { | 21 namespace extensions { |
| 22 | 22 |
| 23 // An abstract base class for permissions that are represented by the | 23 // An abstract base class for permissions that are represented by the |
| 24 // disjunction of a set of conditions. Each condition is represented by a | 24 // disjunction of a set of conditions. Each condition is represented by a |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 APIPermission* Clone() const override { | 65 APIPermission* Clone() const override { |
| 66 SetDisjunctionPermission* result = new DerivedType(info()); | 66 SetDisjunctionPermission* result = new DerivedType(info()); |
| 67 result->data_set_ = data_set_; | 67 result->data_set_ = data_set_; |
| 68 return result; | 68 return result; |
| 69 } | 69 } |
| 70 | 70 |
| 71 APIPermission* Diff(const APIPermission* rhs) const override { | 71 APIPermission* Diff(const APIPermission* rhs) const override { |
| 72 CHECK(rhs->info() == info()); | 72 CHECK(rhs->info() == info()); |
| 73 const SetDisjunctionPermission* perm = | 73 const SetDisjunctionPermission* perm = |
| 74 static_cast<const SetDisjunctionPermission*>(rhs); | 74 static_cast<const SetDisjunctionPermission*>(rhs); |
| 75 scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 75 std::unique_ptr<SetDisjunctionPermission> result(new DerivedType(info())); |
| 76 result->data_set_ = base::STLSetDifference<std::set<PermissionDataType> >( | 76 result->data_set_ = base::STLSetDifference<std::set<PermissionDataType> >( |
| 77 data_set_, perm->data_set_); | 77 data_set_, perm->data_set_); |
| 78 return result->data_set_.empty() ? NULL : result.release(); | 78 return result->data_set_.empty() ? NULL : result.release(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 APIPermission* Union(const APIPermission* rhs) const override { | 81 APIPermission* Union(const APIPermission* rhs) const override { |
| 82 CHECK(rhs->info() == info()); | 82 CHECK(rhs->info() == info()); |
| 83 const SetDisjunctionPermission* perm = | 83 const SetDisjunctionPermission* perm = |
| 84 static_cast<const SetDisjunctionPermission*>(rhs); | 84 static_cast<const SetDisjunctionPermission*>(rhs); |
| 85 scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 85 std::unique_ptr<SetDisjunctionPermission> result(new DerivedType(info())); |
| 86 result->data_set_ = base::STLSetUnion<std::set<PermissionDataType> >( | 86 result->data_set_ = base::STLSetUnion<std::set<PermissionDataType> >( |
| 87 data_set_, perm->data_set_); | 87 data_set_, perm->data_set_); |
| 88 return result.release(); | 88 return result.release(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 APIPermission* Intersect(const APIPermission* rhs) const override { | 91 APIPermission* Intersect(const APIPermission* rhs) const override { |
| 92 CHECK(rhs->info() == info()); | 92 CHECK(rhs->info() == info()); |
| 93 const SetDisjunctionPermission* perm = | 93 const SetDisjunctionPermission* perm = |
| 94 static_cast<const SetDisjunctionPermission*>(rhs); | 94 static_cast<const SetDisjunctionPermission*>(rhs); |
| 95 scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); | 95 std::unique_ptr<SetDisjunctionPermission> result(new DerivedType(info())); |
| 96 result->data_set_ = base::STLSetIntersection<std::set<PermissionDataType> >( | 96 result->data_set_ = base::STLSetIntersection<std::set<PermissionDataType> >( |
| 97 data_set_, perm->data_set_); | 97 data_set_, perm->data_set_); |
| 98 return result->data_set_.empty() ? NULL : result.release(); | 98 return result->data_set_.empty() ? NULL : result.release(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 bool FromValue( | 101 bool FromValue( |
| 102 const base::Value* value, | 102 const base::Value* value, |
| 103 std::string* error, | 103 std::string* error, |
| 104 std::vector<std::string>* unhandled_permissions) override { | 104 std::vector<std::string>* unhandled_permissions) override { |
| 105 data_set_.clear(); | 105 data_set_.clear(); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 135 *error = "Cannot parse an item from the permission list: " + | 135 *error = "Cannot parse an item from the permission list: " + |
| 136 unknown_permission; | 136 unknown_permission; |
| 137 } | 137 } |
| 138 return false; | 138 return false; |
| 139 } | 139 } |
| 140 } | 140 } |
| 141 } | 141 } |
| 142 return true; | 142 return true; |
| 143 } | 143 } |
| 144 | 144 |
| 145 scoped_ptr<base::Value> ToValue() const override { | 145 std::unique_ptr<base::Value> ToValue() const override { |
| 146 base::ListValue* list = new base::ListValue(); | 146 base::ListValue* list = new base::ListValue(); |
| 147 typename std::set<PermissionDataType>::const_iterator i; | 147 typename std::set<PermissionDataType>::const_iterator i; |
| 148 for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 148 for (i = data_set_.begin(); i != data_set_.end(); ++i) { |
| 149 scoped_ptr<base::Value> item_value(i->ToValue()); | 149 std::unique_ptr<base::Value> item_value(i->ToValue()); |
| 150 list->Append(item_value.release()); | 150 list->Append(item_value.release()); |
| 151 } | 151 } |
| 152 return scoped_ptr<base::Value>(list); | 152 return std::unique_ptr<base::Value>(list); |
| 153 } | 153 } |
| 154 | 154 |
| 155 void Write(base::Pickle* m) const override { IPC::WriteParam(m, data_set_); } | 155 void Write(base::Pickle* m) const override { IPC::WriteParam(m, data_set_); } |
| 156 | 156 |
| 157 bool Read(const base::Pickle* m, base::PickleIterator* iter) override { | 157 bool Read(const base::Pickle* m, base::PickleIterator* iter) override { |
| 158 return IPC::ReadParam(m, iter, &data_set_); | 158 return IPC::ReadParam(m, iter, &data_set_); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void Log(std::string* log) const override { | 161 void Log(std::string* log) const override { |
| 162 IPC::LogParam(data_set_, log); | 162 IPC::LogParam(data_set_, log); |
| 163 } | 163 } |
| 164 | 164 |
| 165 protected: | 165 protected: |
| 166 std::set<PermissionDataType> data_set_; | 166 std::set<PermissionDataType> data_set_; |
| 167 }; | 167 }; |
| 168 | 168 |
| 169 } // namespace extensions | 169 } // namespace extensions |
| 170 | 170 |
| 171 #endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ | 171 #endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ |
| OLD | NEW |