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

Unified Diff: base/prefs/pref_member.h

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process base/ Created 6 years, 3 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: base/prefs/pref_member.h
diff --git a/base/prefs/pref_member.h b/base/prefs/pref_member.h
index 2c3445dcb27388a9014685499b158e71b9229a83..a2989d420f8f5209e2ed72615ec7b3ac7b70c6b9 100644
--- a/base/prefs/pref_member.h
+++ b/base/prefs/pref_member.h
@@ -116,8 +116,8 @@ class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver {
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
// PrefObserver
- virtual void OnPreferenceChanged(PrefService* service,
- const std::string& pref_name) OVERRIDE;
+ void OnPreferenceChanged(PrefService* service,
+ const std::string& pref_name) override;
void VerifyValuePrefName() const {
DCHECK(!pref_name_.empty());
@@ -263,8 +263,8 @@ class PrefMember : public subtle::PrefMemberBase {
protected:
virtual ~Internal() {}
- virtual BASE_PREFS_EXPORT bool UpdateValueInternal(
- const base::Value& value) const OVERRIDE;
+ BASE_PREFS_EXPORT bool UpdateValueInternal(
+ const base::Value& value) const override;
// We cache the value of the pref so we don't have to keep walking the pref
// tree.
@@ -273,8 +273,8 @@ class PrefMember : public subtle::PrefMemberBase {
DISALLOW_COPY_AND_ASSIGN(Internal);
};
- virtual Internal* internal() const OVERRIDE { return internal_.get(); }
- virtual void CreateInternal() const OVERRIDE { internal_ = new Internal(); }
+ Internal* internal() const override { return internal_.get(); }
+ void CreateInternal() const override { internal_ = new Internal(); }
// This method is used to do the actual sync with pref of the specified type.
void BASE_PREFS_EXPORT UpdatePref(const ValueType& value);

Powered by Google App Engine
This is Rietveld 408576698