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

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

Issue 12813004: Chromium style checker cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 9 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 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();
« no previous file with comments | « chrome/test/chromedriver/session_unittest.cc ('k') | components/autofill/browser/autocomplete_history_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698