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

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

Issue 81183005: Remove JsonPrefStore pruning of empty values on write. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove else Created 7 years 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 24 matching lines...) Expand all
35 const base::Value* current_value = NULL; 35 const base::Value* current_value = NULL;
36 DCHECK(defaults_->GetValue(pref_name, &current_value)) 36 DCHECK(defaults_->GetValue(pref_name, &current_value))
37 << "Setting default for unregistered pref: " << pref_name; 37 << "Setting default for unregistered pref: " << pref_name;
38 DCHECK(value->IsType(current_value->GetType())) 38 DCHECK(value->IsType(current_value->GetType()))
39 << "Wrong type for new default: " << pref_name; 39 << "Wrong type for new default: " << pref_name;
40 } 40 }
41 41
42 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value)); 42 defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value));
43 } 43 }
44 44
45 void PrefRegistry::SetRegistrationCallback(
46 const RegistrationCallback& callback) {
47 registration_callback_ = callback;
48 }
49
50 void PrefRegistry::RegisterPreference(const char* path, 45 void PrefRegistry::RegisterPreference(const char* path,
51 base::Value* default_value) { 46 base::Value* default_value) {
52 base::Value::Type orig_type = default_value->GetType(); 47 base::Value::Type orig_type = default_value->GetType();
53 DCHECK(orig_type != base::Value::TYPE_NULL && 48 DCHECK(orig_type != base::Value::TYPE_NULL &&
54 orig_type != base::Value::TYPE_BINARY) << 49 orig_type != base::Value::TYPE_BINARY) <<
55 "invalid preference type: " << orig_type; 50 "invalid preference type: " << orig_type;
56 DCHECK(!defaults_->GetValue(path, NULL)) << 51 DCHECK(!defaults_->GetValue(path, NULL)) <<
57 "Trying to register a previously registered pref: " << path; 52 "Trying to register a previously registered pref: " << path;
58 53
59 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value)); 54 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value));
60
61 if (!registration_callback_.is_null())
62 registration_callback_.Run(path, default_value);
63 } 55 }
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