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

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

Issue 12330008: Get rid of the ability to unregister preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit. Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « base/prefs/pref_registry.h ('k') | base/prefs/pref_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_registry.h" 5 #include "base/prefs/pref_registry.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/pref_store.h" 9 #include "base/prefs/pref_store.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 15 matching lines...) Expand all
26 26
27 PrefRegistry::const_iterator PrefRegistry::end() const { 27 PrefRegistry::const_iterator PrefRegistry::end() const {
28 return defaults_->end(); 28 return defaults_->end();
29 } 29 }
30 30
31 void PrefRegistry::SetRegistrationCallback( 31 void PrefRegistry::SetRegistrationCallback(
32 const RegistrationCallback& callback) { 32 const RegistrationCallback& callback) {
33 registration_callback_ = callback; 33 registration_callback_ = callback;
34 } 34 }
35 35
36 void PrefRegistry::SetUnregistrationCallback(
37 const UnregistrationCallback& callback) {
38 unregistration_callback_ = callback;
39 }
40
41 void PrefRegistry::DeprecatedUnregisterPreference(const char* path) {
42 DCHECK(defaults_->GetValue(path, NULL)) <<
43 "Trying to unregister an unregistered pref: " << path;
44
45 defaults_->RemoveDefaultValue(path);
46
47 if (!unregistration_callback_.is_null())
48 unregistration_callback_.Run(path);
49 }
50
51 void PrefRegistry::RegisterPreference(const char* path, 36 void PrefRegistry::RegisterPreference(const char* path,
52 base::Value* default_value) { 37 base::Value* default_value) {
53 base::Value::Type orig_type = default_value->GetType(); 38 base::Value::Type orig_type = default_value->GetType();
54 DCHECK(orig_type != base::Value::TYPE_NULL && 39 DCHECK(orig_type != base::Value::TYPE_NULL &&
55 orig_type != base::Value::TYPE_BINARY) << 40 orig_type != base::Value::TYPE_BINARY) <<
56 "invalid preference type: " << orig_type; 41 "invalid preference type: " << orig_type;
57 DCHECK(!defaults_->GetValue(path, NULL)) << 42 DCHECK(!defaults_->GetValue(path, NULL)) <<
58 "Trying to register a previously registered pref: " << path; 43 "Trying to register a previously registered pref: " << path;
59 44
60 defaults_->SetDefaultValue(path, default_value); 45 defaults_->SetDefaultValue(path, default_value);
61 46
62 if (!registration_callback_.is_null()) 47 if (!registration_callback_.is_null())
63 registration_callback_.Run(path, default_value); 48 registration_callback_.Run(path, default_value);
64 } 49 }
OLDNEW
« no previous file with comments | « base/prefs/pref_registry.h ('k') | base/prefs/pref_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698