From aa3174b125392c20bbac2db1b324a050340d9578 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Fri, 15 Mar 2013 09:12:48 +0000 Subject: Chromium style checker cleanup Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 TBR=ben, brettw, jamesr, joi, satorux, piman, wez Review URL: https://chromiumcodereview.appspot.com/12813004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188311 0039d316-1c4b-4281-b951-d872f2087c98 --- chromeos/network/onc/onc_merger.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'chromeos') diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc index d5e6c65..7fecfb4 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 MergeValues(ValueParams values) { + virtual scoped_ptr 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 MergeValues(ValueParams values) { + virtual scoped_ptr MergeValues( + ValueParams values) OVERRIDE { scoped_ptr result(new base::DictionaryValue); std::string which_effective; MergeToEffective::MergeValues(values, &which_effective).reset(); -- cgit v1.1