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

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

Issue 12315116: Add ability to change default pref values, and use in BrowserInstantController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR and address review nit. 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 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 10 matching lines...) Expand all
21 } 21 }
22 22
23 PrefRegistry::const_iterator PrefRegistry::begin() const { 23 PrefRegistry::const_iterator PrefRegistry::begin() const {
24 return defaults_->begin(); 24 return defaults_->begin();
25 } 25 }
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::SetDefaultPrefValue(const char* pref_name,
32 base::Value* value) {
33 DCHECK(value);
34 if (DCHECK_IS_ON()) {
35 const base::Value* current_value = NULL;
36 DCHECK(defaults_->GetValue(pref_name, &current_value))
37 << "Setting default for unregistered pref: " << pref_name;
38 DCHECK(value->IsType(current_value->GetType()))
39 << "Wrong type for new default: " << pref_name;
40 }
41
42 defaults_->RemoveDefaultValue(pref_name);
43 defaults_->SetDefaultValue(pref_name, value);
44 }
45
31 void PrefRegistry::SetRegistrationCallback( 46 void PrefRegistry::SetRegistrationCallback(
32 const RegistrationCallback& callback) { 47 const RegistrationCallback& callback) {
33 registration_callback_ = callback; 48 registration_callback_ = callback;
34 } 49 }
35 50
36 void PrefRegistry::RegisterPreference(const char* path, 51 void PrefRegistry::RegisterPreference(const char* path,
37 base::Value* default_value) { 52 base::Value* default_value) {
38 base::Value::Type orig_type = default_value->GetType(); 53 base::Value::Type orig_type = default_value->GetType();
39 DCHECK(orig_type != base::Value::TYPE_NULL && 54 DCHECK(orig_type != base::Value::TYPE_NULL &&
40 orig_type != base::Value::TYPE_BINARY) << 55 orig_type != base::Value::TYPE_BINARY) <<
41 "invalid preference type: " << orig_type; 56 "invalid preference type: " << orig_type;
42 DCHECK(!defaults_->GetValue(path, NULL)) << 57 DCHECK(!defaults_->GetValue(path, NULL)) <<
43 "Trying to register a previously registered pref: " << path; 58 "Trying to register a previously registered pref: " << path;
44 59
45 defaults_->SetDefaultValue(path, default_value); 60 defaults_->SetDefaultValue(path, default_value);
46 61
47 if (!registration_callback_.is_null()) 62 if (!registration_callback_.is_null())
48 registration_callback_.Run(path, default_value); 63 registration_callback_.Run(path, default_value);
49 } 64 }
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