summaryrefslogtreecommitdiffstats
path: root/chromeos/network/onc
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos/network/onc')
-rw-r--r--chromeos/network/onc/onc_certificate_importer_impl.h2
-rw-r--r--chromeos/network/onc/onc_certificate_importer_impl_unittest.cc4
-rw-r--r--chromeos/network/onc/onc_merger.cc8
-rw-r--r--chromeos/network/onc/onc_normalizer.h2
-rw-r--r--chromeos/network/onc/onc_utils.cc2
-rw-r--r--chromeos/network/onc/onc_utils_unittest.cc2
-rw-r--r--chromeos/network/onc/onc_validator.h10
7 files changed, 15 insertions, 15 deletions
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.h b/chromeos/network/onc/onc_certificate_importer_impl.h
index 079cd88..899ab58 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl.h
+++ b/chromeos/network/onc/onc_certificate_importer_impl.h
@@ -50,7 +50,7 @@ class CHROMEOS_EXPORT CertificateImporterImpl : public CertificateImporter {
// CertificateImporter overrides
virtual void ImportCertificates(const base::ListValue& certificates,
::onc::ONCSource source,
- const DoneCallback& done_callback) OVERRIDE;
+ const DoneCallback& done_callback) override;
private:
void RunDoneCallback(const CertificateImporter::DoneCallback& callback,
diff --git a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
index bbe8a86..362676b 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
+++ b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
@@ -67,7 +67,7 @@ class ONCCertificateImporterImplTest : public testing::Test {
ONCCertificateImporterImplTest() {}
virtual ~ONCCertificateImporterImplTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(public_nssdb_.is_open());
ASSERT_TRUE(private_nssdb_.is_open());
@@ -84,7 +84,7 @@ class ONCCertificateImporterImplTest : public testing::Test {
EXPECT_TRUE(ListCertsInPrivateSlot().empty());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
thread_task_runner_handle_.reset();
task_runner_ = NULL;
}
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 4dcaae9..915f549 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_;
diff --git a/chromeos/network/onc/onc_normalizer.h b/chromeos/network/onc/onc_normalizer.h
index 4537650..7268879 100644
--- a/chromeos/network/onc/onc_normalizer.h
+++ b/chromeos/network/onc/onc_normalizer.h
@@ -34,7 +34,7 @@ class CHROMEOS_EXPORT Normalizer : public Mapper {
virtual scoped_ptr<base::DictionaryValue> MapObject(
const OncValueSignature& signature,
const base::DictionaryValue& onc_object,
- bool* error) OVERRIDE;
+ bool* error) override;
void NormalizeCertificate(base::DictionaryValue* cert);
void NormalizeEAP(base::DictionaryValue* eap);
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 9eb4e50..fdff42d 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -263,7 +263,7 @@ class OncMaskValues : public Mapper {
const OncValueSignature& object_signature,
const base::Value& onc_value,
bool* found_unknown_field,
- bool* error) OVERRIDE {
+ bool* error) override {
if (FieldIsCredential(object_signature, field_name)) {
return scoped_ptr<base::Value>(new base::StringValue(mask_));
} else {
diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc
index b29398b..90ce28a 100644
--- a/chromeos/network/onc/onc_utils_unittest.cc
+++ b/chromeos/network/onc/onc_utils_unittest.cc
@@ -59,7 +59,7 @@ class StringSubstitutionStub : public StringSubstitution {
public:
StringSubstitutionStub() {}
virtual bool GetSubstitute(const std::string& placeholder,
- std::string* substitute) const OVERRIDE {
+ std::string* substitute) const override {
if (placeholder == ::onc::substitutes::kLoginIDField)
*substitute = kLoginId;
else if (placeholder ==::onc::substitutes::kEmailField)
diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h
index 05c95d5..1108b55 100644
--- a/chromeos/network/onc/onc_validator.h
+++ b/chromeos/network/onc/onc_validator.h
@@ -102,7 +102,7 @@ class CHROMEOS_EXPORT Validator : public Mapper {
// |signature|. On error returns NULL.
virtual scoped_ptr<base::Value> MapValue(const OncValueSignature& signature,
const base::Value& onc_value,
- bool* error) OVERRIDE;
+ bool* error) override;
// Dispatch to the right validation function according to
// |signature|. Iterates over all fields and recursively validates/repairs
@@ -111,7 +111,7 @@ class CHROMEOS_EXPORT Validator : public Mapper {
virtual scoped_ptr<base::DictionaryValue> MapObject(
const OncValueSignature& signature,
const base::DictionaryValue& onc_object,
- bool* error) OVERRIDE;
+ bool* error) override;
// Pushes/pops the |field_name| to |path_|, otherwise like |Mapper::MapField|.
virtual scoped_ptr<base::Value> MapField(
@@ -119,20 +119,20 @@ class CHROMEOS_EXPORT Validator : public Mapper {
const OncValueSignature& object_signature,
const base::Value& onc_value,
bool* found_unknown_field,
- bool* error) OVERRIDE;
+ bool* error) override;
// Ignores nested errors in NetworkConfigurations and Certificates, otherwise
// like |Mapper::MapArray|.
virtual scoped_ptr<base::ListValue> MapArray(
const OncValueSignature& array_signature,
const base::ListValue& onc_array,
- bool* nested_error) OVERRIDE;
+ bool* nested_error) override;
// Pushes/pops the index to |path_|, otherwise like |Mapper::MapEntry|.
virtual scoped_ptr<base::Value> MapEntry(int index,
const OncValueSignature& signature,
const base::Value& onc_value,
- bool* error) OVERRIDE;
+ bool* error) override;
// This is the default validation of objects/dictionaries. Validates
// |onc_object| according to |object_signature|. |result| must point to a
generated by cgit v1.1 at 2025-02-13 23:01:55 +0000