| Index: chromeos/network/onc/onc_merger.cc
|
| diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
|
| index d5e6c65799c41d3ba141da2a7df1b6dbc58a6b8e..7fecfb423f5fa930fb4c98a59fe6cfe520012906 100644
|
| --- a/chromeos/network/onc/onc_merger.cc
|
| +++ b/chromeos/network/onc/onc_merger.cc
|
| @@ -264,7 +264,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
|
| }
|
|
|
| // MergeSettingsAndPolicies override.
|
| - virtual scoped_ptr<base::Value> MergeValues(ValueParams values) {
|
| + virtual scoped_ptr<base::Value> MergeValues(
|
| + ValueParams values) OVERRIDE {
|
| std::string which;
|
| return MergeValues(values, &which);
|
| }
|
| @@ -276,7 +277,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
|
| class MergeToAugmented : public MergeToEffective {
|
| protected:
|
| // MergeSettingsAndPolicies override.
|
| - virtual scoped_ptr<base::Value> MergeValues(ValueParams values) {
|
| + virtual scoped_ptr<base::Value> MergeValues(
|
| + ValueParams values) OVERRIDE {
|
| scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
|
| std::string which_effective;
|
| MergeToEffective::MergeValues(values, &which_effective).reset();
|
|
|