Commit e878919b authored by tfarina@chromium.org's avatar tfarina@chromium.org

base: Add missing OVERRIDE annotations to overridden methods from Value.

BUG=None
TEST=None

R=evan@chromium.org

Review URL: http://codereview.chromium.org/7617016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96452 0039d316-1c4b-4281-b951-d872f2087c98
parent 77fcfdaf
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "base/base_export.h" #include "base/base_export.h"
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/string16.h" #include "base/string16.h"
// This file declares "using base::Value", etc. at the bottom, so that // This file declares "using base::Value", etc. at the bottom, so that
...@@ -133,12 +134,12 @@ class BASE_EXPORT FundamentalValue : public Value { ...@@ -133,12 +134,12 @@ class BASE_EXPORT FundamentalValue : public Value {
explicit FundamentalValue(double in_value); explicit FundamentalValue(double in_value);
virtual ~FundamentalValue(); virtual ~FundamentalValue();
// Subclassed methods // Overridden from Value:
virtual bool GetAsBoolean(bool* out_value) const; virtual bool GetAsBoolean(bool* out_value) const OVERRIDE;
virtual bool GetAsInteger(int* out_value) const; virtual bool GetAsInteger(int* out_value) const OVERRIDE;
virtual bool GetAsDouble(double* out_value) const; virtual bool GetAsDouble(double* out_value) const OVERRIDE;
virtual FundamentalValue* DeepCopy() const; virtual FundamentalValue* DeepCopy() const OVERRIDE;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const OVERRIDE;
private: private:
union { union {
...@@ -160,11 +161,11 @@ class BASE_EXPORT StringValue : public Value { ...@@ -160,11 +161,11 @@ class BASE_EXPORT StringValue : public Value {
virtual ~StringValue(); virtual ~StringValue();
// Subclassed methods // Overridden from Value:
virtual bool GetAsString(std::string* out_value) const; virtual bool GetAsString(std::string* out_value) const OVERRIDE;
virtual bool GetAsString(string16* out_value) const; virtual bool GetAsString(string16* out_value) const OVERRIDE;
virtual StringValue* DeepCopy() const; virtual StringValue* DeepCopy() const OVERRIDE;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const OVERRIDE;
private: private:
std::string value_; std::string value_;
...@@ -192,8 +193,8 @@ class BASE_EXPORT BinaryValue: public Value { ...@@ -192,8 +193,8 @@ class BASE_EXPORT BinaryValue: public Value {
const char* GetBuffer() const { return buffer_; } const char* GetBuffer() const { return buffer_; }
// Overridden from Value: // Overridden from Value:
virtual BinaryValue* DeepCopy() const; virtual BinaryValue* DeepCopy() const OVERRIDE;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const OVERRIDE;
private: private:
// Constructor is private so that only objects with valid buffer pointers // Constructor is private so that only objects with valid buffer pointers
...@@ -342,8 +343,8 @@ class BASE_EXPORT DictionaryValue : public Value { ...@@ -342,8 +343,8 @@ class BASE_EXPORT DictionaryValue : public Value {
key_iterator end_keys() const { return key_iterator(dictionary_.end()); } key_iterator end_keys() const { return key_iterator(dictionary_.end()); }
// Overridden from Value: // Overridden from Value:
virtual DictionaryValue* DeepCopy() const; virtual DictionaryValue* DeepCopy() const OVERRIDE;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const OVERRIDE;
private: private:
ValueMap dictionary_; ValueMap dictionary_;
...@@ -421,18 +422,18 @@ class BASE_EXPORT ListValue : public Value { ...@@ -421,18 +422,18 @@ class BASE_EXPORT ListValue : public Value {
list_.swap(other->list_); list_.swap(other->list_);
} }
// Iteration // Iteration.
ListValue::iterator begin() { return list_.begin(); } iterator begin() { return list_.begin(); }
ListValue::iterator end() { return list_.end(); } iterator end() { return list_.end(); }
ListValue::const_iterator begin() const { return list_.begin(); } const_iterator begin() const { return list_.begin(); }
ListValue::const_iterator end() const { return list_.end(); } const_iterator end() const { return list_.end(); }
// Overridden from Value: // Overridden from Value:
virtual bool GetAsList(ListValue** out_value); virtual bool GetAsList(ListValue** out_value) OVERRIDE;
virtual bool GetAsList(const ListValue** out_value) const; virtual bool GetAsList(const ListValue** out_value) const OVERRIDE;
virtual ListValue* DeepCopy() const; virtual ListValue* DeepCopy() const OVERRIDE;
virtual bool Equals(const Value* other) const; virtual bool Equals(const Value* other) const OVERRIDE;
private: private:
ValueVector list_; ValueVector list_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment