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

Unified Diff: extensions/common/permissions/set_disjunction_permission.h

Issue 201203006: Move basic API permissions code out of //chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move moar things Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: extensions/common/permissions/set_disjunction_permission.h
diff --git a/chrome/common/extensions/permissions/set_disjunction_permission.h b/extensions/common/permissions/set_disjunction_permission.h
similarity index 74%
rename from chrome/common/extensions/permissions/set_disjunction_permission.h
rename to extensions/common/permissions/set_disjunction_permission.h
index b05917f3ef4b8e0f3ebe3392830aeb1b0f14787e..d16bc0fbf5d068f038e877f7143861c78180863d 100644
--- a/chrome/common/extensions/permissions/set_disjunction_permission.h
+++ b/extensions/common/permissions/set_disjunction_permission.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
-#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
+#ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
+#define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
#include <algorithm>
#include <set>
@@ -29,20 +29,18 @@ template <class PermissionDataType, class DerivedType>
class SetDisjunctionPermission : public APIPermission {
public:
explicit SetDisjunctionPermission(const APIPermissionInfo* info)
- : APIPermission(info) {
- }
+ : APIPermission(info) {}
- ~SetDisjunctionPermission() {
- }
+ ~SetDisjunctionPermission() {}
// APIPermission overrides
- virtual bool HasMessages() const OVERRIDE {
- return !data_set_.empty();
- }
+ virtual bool HasMessages() const OVERRIDE { return !data_set_.empty(); }
virtual bool Check(const APIPermission::CheckParam* param) const OVERRIDE {
for (typename std::set<PermissionDataType>::const_iterator i =
- data_set_.begin(); i != data_set_.end(); ++i) {
+ data_set_.begin();
+ i != data_set_.end();
+ ++i) {
if (i->Check(param))
return true;
}
@@ -53,9 +51,10 @@ class SetDisjunctionPermission : public APIPermission {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
- return std::includes(
- data_set_.begin(), data_set_.end(),
- perm->data_set_.begin(), perm->data_set_.end());
+ return std::includes(data_set_.begin(),
+ data_set_.end(),
+ perm->data_set_.begin(),
+ perm->data_set_.end());
}
virtual bool Equal(const APIPermission* rhs) const OVERRIDE {
@@ -76,11 +75,12 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
- std::set_difference(
- data_set_.begin(), data_set_.end(),
- perm->data_set_.begin(), perm->data_set_.end(),
- std::inserter<std::set<PermissionDataType> >(
- result->data_set_, result->data_set_.begin()));
+ std::set_difference(data_set_.begin(),
+ data_set_.end(),
+ perm->data_set_.begin(),
+ perm->data_set_.end(),
+ std::inserter<std::set<PermissionDataType> >(
+ result->data_set_, result->data_set_.begin()));
return result->data_set_.empty() ? NULL : result.release();
}
@@ -89,11 +89,12 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
- std::set_union(
- data_set_.begin(), data_set_.end(),
- perm->data_set_.begin(), perm->data_set_.end(),
- std::inserter<std::set<PermissionDataType> >(
- result->data_set_, result->data_set_.begin()));
+ std::set_union(data_set_.begin(),
+ data_set_.end(),
+ perm->data_set_.begin(),
+ perm->data_set_.end(),
+ std::inserter<std::set<PermissionDataType> >(
+ result->data_set_, result->data_set_.begin()));
return result.release();
}
@@ -102,11 +103,12 @@ class SetDisjunctionPermission : public APIPermission {
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info()));
- std::set_intersection(
- data_set_.begin(), data_set_.end(),
- perm->data_set_.begin(), perm->data_set_.end(),
- std::inserter<std::set<PermissionDataType> >(
- result->data_set_, result->data_set_.begin()));
+ std::set_intersection(data_set_.begin(),
+ data_set_.end(),
+ perm->data_set_.begin(),
+ perm->data_set_.end(),
+ std::inserter<std::set<PermissionDataType> >(
+ result->data_set_, result->data_set_.begin()));
return result->data_set_.empty() ? NULL : result.release();
}
@@ -167,4 +169,4 @@ class SetDisjunctionPermission : public APIPermission {
} // namespace extensions
-#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_
+#endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_

Powered by Google App Engine
This is Rietveld 408576698