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

Side by Side Diff: base/prefs/pref_service.cc

Issue 614103004: replace 'virtual ... OVERRIDE' with '... override' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: process base/ 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 10 matching lines...) Expand all
21 #include "base/value_conversions.h" 21 #include "base/value_conversions.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 23
24 namespace { 24 namespace {
25 25
26 class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate { 26 class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate {
27 public: 27 public:
28 ReadErrorHandler(base::Callback<void(PersistentPrefStore::PrefReadError)> cb) 28 ReadErrorHandler(base::Callback<void(PersistentPrefStore::PrefReadError)> cb)
29 : callback_(cb) {} 29 : callback_(cb) {}
30 30
31 virtual void OnError(PersistentPrefStore::PrefReadError error) OVERRIDE { 31 void OnError(PersistentPrefStore::PrefReadError error) override {
32 callback_.Run(error); 32 callback_.Run(error);
33 } 33 }
34 34
35 private: 35 private:
36 base::Callback<void(PersistentPrefStore::PrefReadError)> callback_; 36 base::Callback<void(PersistentPrefStore::PrefReadError)> callback_;
37 }; 37 };
38 38
39 } // namespace 39 } // namespace
40 40
41 PrefService::PrefService( 41 PrefService::PrefService(
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 DCHECK(found_value->IsType(default_type)); 547 DCHECK(found_value->IsType(default_type));
548 return found_value; 548 return found_value;
549 } else { 549 } else {
550 // Every registered preference has at least a default value. 550 // Every registered preference has at least a default value.
551 NOTREACHED() << "no valid value found for registered pref " << path; 551 NOTREACHED() << "no valid value found for registered pref " << path;
552 } 552 }
553 } 553 }
554 554
555 return NULL; 555 return NULL;
556 } 556 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698