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

Unified Diff: base/prefs/pref_member.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/prefs/pref_change_registrar_unittest.cc ('k') | base/prefs/pref_notifier_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/pref_member.h
diff --git a/base/prefs/pref_member.h b/base/prefs/pref_member.h
index 2c3445dcb27388a9014685499b158e71b9229a83..fc277930a5f9be686fe62a5a4f6c7a0fba8d7c6c 100644
--- a/base/prefs/pref_member.h
+++ b/base/prefs/pref_member.h
@@ -117,7 +117,7 @@ class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver {
// PrefObserver
virtual void OnPreferenceChanged(PrefService* service,
- const std::string& pref_name) OVERRIDE;
+ const std::string& pref_name) override;
void VerifyValuePrefName() const {
DCHECK(!pref_name_.empty());
@@ -264,7 +264,7 @@ class PrefMember : public subtle::PrefMemberBase {
virtual ~Internal() {}
virtual BASE_PREFS_EXPORT bool UpdateValueInternal(
- const base::Value& value) const OVERRIDE;
+ 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(); }
+ virtual Internal* internal() const override { return internal_.get(); }
+ virtual 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);
« no previous file with comments | « base/prefs/pref_change_registrar_unittest.cc ('k') | base/prefs/pref_notifier_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698