| Index: extensions/common/permissions/api_permission.cc
|
| diff --git a/extensions/common/permissions/api_permission.cc b/extensions/common/permissions/api_permission.cc
|
| index de0dd98970e2c43b4a917af90f55f1561a1ce0ef..5ffaf6aa652bca8478ef087295fab6f9a3dce414 100644
|
| --- a/extensions/common/permissions/api_permission.cc
|
| +++ b/extensions/common/permissions/api_permission.cc
|
| @@ -20,11 +20,11 @@ class SimpleAPIPermission : public APIPermission {
|
|
|
| virtual ~SimpleAPIPermission() { }
|
|
|
| - virtual bool HasMessages() const OVERRIDE {
|
| + virtual bool HasMessages() const override {
|
| return info()->message_id() > PermissionMessage::kNone;
|
| }
|
|
|
| - virtual PermissionMessages GetMessages() const OVERRIDE {
|
| + virtual PermissionMessages GetMessages() const override {
|
| DCHECK(HasMessages());
|
| PermissionMessages result;
|
| result.push_back(GetMessage_());
|
| @@ -32,16 +32,16 @@ class SimpleAPIPermission : public APIPermission {
|
| }
|
|
|
| virtual bool Check(
|
| - const APIPermission::CheckParam* param) const OVERRIDE {
|
| + const APIPermission::CheckParam* param) const override {
|
| return !param;
|
| }
|
|
|
| - virtual bool Contains(const APIPermission* rhs) const OVERRIDE {
|
| + virtual bool Contains(const APIPermission* rhs) const override {
|
| CHECK_EQ(info(), rhs->info());
|
| return true;
|
| }
|
|
|
| - virtual bool Equal(const APIPermission* rhs) const OVERRIDE {
|
| + virtual bool Equal(const APIPermission* rhs) const override {
|
| if (this != rhs)
|
| CHECK_EQ(info(), rhs->info());
|
| return true;
|
| @@ -50,40 +50,40 @@ class SimpleAPIPermission : public APIPermission {
|
| virtual bool FromValue(
|
| const base::Value* value,
|
| std::string* /*error*/,
|
| - std::vector<std::string>* /*unhandled_permissions*/) OVERRIDE {
|
| + std::vector<std::string>* /*unhandled_permissions*/) override {
|
| return (value == NULL);
|
| }
|
|
|
| - virtual scoped_ptr<base::Value> ToValue() const OVERRIDE {
|
| + virtual scoped_ptr<base::Value> ToValue() const override {
|
| return scoped_ptr<base::Value>();
|
| }
|
|
|
| - virtual APIPermission* Clone() const OVERRIDE {
|
| + virtual APIPermission* Clone() const override {
|
| return new SimpleAPIPermission(info());
|
| }
|
|
|
| - virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE {
|
| + virtual APIPermission* Diff(const APIPermission* rhs) const override {
|
| CHECK_EQ(info(), rhs->info());
|
| return NULL;
|
| }
|
|
|
| - virtual APIPermission* Union(const APIPermission* rhs) const OVERRIDE {
|
| + virtual APIPermission* Union(const APIPermission* rhs) const override {
|
| CHECK_EQ(info(), rhs->info());
|
| return new SimpleAPIPermission(info());
|
| }
|
|
|
| - virtual APIPermission* Intersect(const APIPermission* rhs) const OVERRIDE {
|
| + virtual APIPermission* Intersect(const APIPermission* rhs) const override {
|
| CHECK_EQ(info(), rhs->info());
|
| return new SimpleAPIPermission(info());
|
| }
|
|
|
| - virtual void Write(IPC::Message* m) const OVERRIDE { }
|
| + virtual void Write(IPC::Message* m) const override { }
|
|
|
| - virtual bool Read(const IPC::Message* m, PickleIterator* iter) OVERRIDE {
|
| + virtual bool Read(const IPC::Message* m, PickleIterator* iter) override {
|
| return true;
|
| }
|
|
|
| - virtual void Log(std::string* log) const OVERRIDE { }
|
| + virtual void Log(std::string* log) const override { }
|
| };
|
|
|
| } // namespace
|
|
|