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

Unified Diff: base/values.h

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ Created 6 years, 2 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 | « base/tools_sanity_unittest.cc ('k') | base/win/enum_variant.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/values.h
diff --git a/base/values.h b/base/values.h
index d5e631310319f2476b5fe80eabeb96ec9b88a0da..68dd9c8b859eedc8112bfcc39975dfbcc78dc3a1 100644
--- a/base/values.h
+++ b/base/values.h
@@ -124,13 +124,13 @@ class BASE_EXPORT FundamentalValue : public Value {
virtual ~FundamentalValue();
// Overridden from Value:
- virtual bool GetAsBoolean(bool* out_value) const OVERRIDE;
- virtual bool GetAsInteger(int* out_value) const OVERRIDE;
+ virtual bool GetAsBoolean(bool* out_value) const override;
+ virtual bool GetAsInteger(int* out_value) const override;
// Values of both type TYPE_INTEGER and TYPE_DOUBLE can be obtained as
// doubles.
- virtual bool GetAsDouble(double* out_value) const OVERRIDE;
- virtual FundamentalValue* DeepCopy() const OVERRIDE;
- virtual bool Equals(const Value* other) const OVERRIDE;
+ virtual bool GetAsDouble(double* out_value) const override;
+ virtual FundamentalValue* DeepCopy() const override;
+ virtual bool Equals(const Value* other) const override;
private:
union {
@@ -155,11 +155,11 @@ class BASE_EXPORT StringValue : public Value {
const std::string& GetString() const;
// Overridden from Value:
- virtual bool GetAsString(std::string* out_value) const OVERRIDE;
- virtual bool GetAsString(string16* out_value) const OVERRIDE;
- virtual bool GetAsString(const StringValue** out_value) const OVERRIDE;
- virtual StringValue* DeepCopy() const OVERRIDE;
- virtual bool Equals(const Value* other) const OVERRIDE;
+ virtual bool GetAsString(std::string* out_value) const override;
+ virtual bool GetAsString(string16* out_value) const override;
+ virtual bool GetAsString(const StringValue** out_value) const override;
+ virtual StringValue* DeepCopy() const override;
+ virtual bool Equals(const Value* other) const override;
private:
std::string value_;
@@ -188,8 +188,8 @@ class BASE_EXPORT BinaryValue: public Value {
const char* GetBuffer() const { return buffer_.get(); }
// Overridden from Value:
- virtual BinaryValue* DeepCopy() const OVERRIDE;
- virtual bool Equals(const Value* other) const OVERRIDE;
+ virtual BinaryValue* DeepCopy() const override;
+ virtual bool Equals(const Value* other) const override;
private:
scoped_ptr<char[]> buffer_;
@@ -207,9 +207,9 @@ class BASE_EXPORT DictionaryValue : public Value {
virtual ~DictionaryValue();
// Overridden from Value:
- virtual bool GetAsDictionary(DictionaryValue** out_value) OVERRIDE;
+ virtual bool GetAsDictionary(DictionaryValue** out_value) override;
virtual bool GetAsDictionary(
- const DictionaryValue** out_value) const OVERRIDE;
+ const DictionaryValue** out_value) const override;
// Returns true if the current dictionary has a value for the given key.
bool HasKey(const std::string& key) const;
@@ -362,8 +362,8 @@ class BASE_EXPORT DictionaryValue : public Value {
};
// Overridden from Value:
- virtual DictionaryValue* DeepCopy() const OVERRIDE;
- virtual bool Equals(const Value* other) const OVERRIDE;
+ virtual DictionaryValue* DeepCopy() const override;
+ virtual bool Equals(const Value* other) const override;
private:
ValueMap dictionary_;
@@ -476,10 +476,10 @@ class BASE_EXPORT ListValue : public Value {
const_iterator end() const { return list_.end(); }
// Overridden from Value:
- virtual bool GetAsList(ListValue** out_value) OVERRIDE;
- virtual bool GetAsList(const ListValue** out_value) const OVERRIDE;
- virtual ListValue* DeepCopy() const OVERRIDE;
- virtual bool Equals(const Value* other) const OVERRIDE;
+ virtual bool GetAsList(ListValue** out_value) override;
+ virtual bool GetAsList(const ListValue** out_value) const override;
+ virtual ListValue* DeepCopy() const override;
+ virtual bool Equals(const Value* other) const override;
private:
ValueVector list_;
« no previous file with comments | « base/tools_sanity_unittest.cc ('k') | base/win/enum_variant.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698