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

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

Issue 1104543004: Update {virtual,override} to follow C++11 style in extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « extensions/browser/mock_extension_system.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/set_disjunction_permission.h
diff --git a/extensions/common/permissions/set_disjunction_permission.h b/extensions/common/permissions/set_disjunction_permission.h
index 20bc3ea7dcaed238607fb098c71d4ca4ae8d78e9..87d185886e3f94f9130fde67cc4ca80269f0a948 100644
--- a/extensions/common/permissions/set_disjunction_permission.h
+++ b/extensions/common/permissions/set_disjunction_permission.h
@@ -31,12 +31,12 @@ class SetDisjunctionPermission : public APIPermission {
explicit SetDisjunctionPermission(const APIPermissionInfo* info)
: APIPermission(info) {}
- ~SetDisjunctionPermission() {}
+ ~SetDisjunctionPermission() override {}
// APIPermission overrides
- virtual bool HasMessages() const override { return !data_set_.empty(); }
+ bool HasMessages() const override { return !data_set_.empty(); }
- virtual bool Check(const APIPermission::CheckParam* param) const override {
+ bool Check(const APIPermission::CheckParam* param) const override {
for (typename std::set<PermissionDataType>::const_iterator i =
data_set_.begin();
i != data_set_.end();
@@ -47,7 +47,7 @@ class SetDisjunctionPermission : public APIPermission {
return false;
}
- virtual bool Contains(const APIPermission* rhs) const override {
+ bool Contains(const APIPermission* rhs) const override {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
@@ -55,20 +55,20 @@ class SetDisjunctionPermission : public APIPermission {
data_set_, perm->data_set_);
}
- virtual bool Equal(const APIPermission* rhs) const override {
+ bool Equal(const APIPermission* rhs) const override {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
return data_set_ == perm->data_set_;
}
- virtual APIPermission* Clone() const override {
+ APIPermission* Clone() const override {
SetDisjunctionPermission* result = new DerivedType(info());
result->data_set_ = data_set_;
return result;
}
- virtual APIPermission* Diff(const APIPermission* rhs) const override {
+ APIPermission* Diff(const APIPermission* rhs) const override {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
@@ -78,7 +78,7 @@ class SetDisjunctionPermission : public APIPermission {
return result->data_set_.empty() ? NULL : result.release();
}
- virtual APIPermission* Union(const APIPermission* rhs) const override {
+ APIPermission* Union(const APIPermission* rhs) const override {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
@@ -88,7 +88,7 @@ class SetDisjunctionPermission : public APIPermission {
return result.release();
}
- virtual APIPermission* Intersect(const APIPermission* rhs) const override {
+ APIPermission* Intersect(const APIPermission* rhs) const override {
CHECK(rhs->info() == info());
const SetDisjunctionPermission* perm =
static_cast<const SetDisjunctionPermission*>(rhs);
@@ -98,7 +98,7 @@ class SetDisjunctionPermission : public APIPermission {
return result->data_set_.empty() ? NULL : result.release();
}
- virtual bool FromValue(
+ bool FromValue(
const base::Value* value,
std::string* error,
std::vector<std::string>* unhandled_permissions) override {
@@ -137,7 +137,7 @@ class SetDisjunctionPermission : public APIPermission {
return true;
}
- virtual scoped_ptr<base::Value> ToValue() const override {
+ scoped_ptr<base::Value> ToValue() const override {
base::ListValue* list = new base::ListValue();
typename std::set<PermissionDataType>::const_iterator i;
for (i = data_set_.begin(); i != data_set_.end(); ++i) {
@@ -147,15 +147,15 @@ class SetDisjunctionPermission : public APIPermission {
return scoped_ptr<base::Value>(list);
}
- virtual void Write(IPC::Message* m) const override {
+ void Write(IPC::Message* m) const override {
IPC::WriteParam(m, data_set_);
}
- virtual bool Read(const IPC::Message* m, PickleIterator* iter) override {
+ bool Read(const IPC::Message* m, PickleIterator* iter) override {
return IPC::ReadParam(m, iter, &data_set_);
}
- virtual void Log(std::string* log) const override {
+ void Log(std::string* log) const override {
IPC::LogParam(data_set_, log);
}
« no previous file with comments | « extensions/browser/mock_extension_system.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698