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

Unified Diff: chromeos/network/onc/onc_merger.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: chromeos/network/onc/onc_merger.cc
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 4dcaae98d0e0d6146ad826cf5ee55ea2a020dc41..915f5492c56137e9be19c90bd198f9b50df7ca46 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -217,7 +217,7 @@ class MergeSettingsAndPolicies : public MergeListOfDictionaries {
// MergeListOfDictionaries override.
virtual scoped_ptr<base::Value> MergeListOfValues(
const std::string& key,
- const std::vector<const base::Value*>& values) OVERRIDE {
+ const std::vector<const base::Value*>& values) override {
bool user_editable = !HasUserPolicy();
if (values[kUserEditableIndex])
values[kUserEditableIndex]->GetAsBoolean(&user_editable);
@@ -305,7 +305,7 @@ class MergeToEffective : public MergeSettingsAndPolicies {
// MergeSettingsAndPolicies override.
virtual scoped_ptr<base::Value> MergeValues(
const std::string& key,
- const ValueParams& values) OVERRIDE {
+ const ValueParams& values) override {
std::string which;
return MergeValues(key, values, &which);
}
@@ -360,7 +360,7 @@ class MergeToAugmented : public MergeToEffective {
// MergeSettingsAndPolicies override.
virtual scoped_ptr<base::Value> MergeValues(
const std::string& key,
- const ValueParams& values) OVERRIDE {
+ const ValueParams& values) override {
const OncFieldSignature* field = NULL;
if (signature_)
field = GetFieldSignature(*signature_, key);
@@ -445,7 +445,7 @@ class MergeToAugmented : public MergeToEffective {
// MergeListOfDictionaries override.
virtual DictionaryPtr MergeNestedDictionaries(
const std::string& key,
- const DictPtrs &dicts) OVERRIDE {
+ const DictPtrs &dicts) override {
DictionaryPtr result;
if (signature_) {
const OncValueSignature* enclosing_signature = signature_;
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl_unittest.cc ('k') | chromeos/network/onc/onc_normalizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698