| OLD | NEW |
| 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 "chrome/browser/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" |
| 11 | 11 |
| 12 PrefRegistry::PrefRegistry() | 12 PrefRegistry::PrefRegistry() |
| 13 : defaults_(new DefaultPrefStore()) { | 13 : defaults_(new DefaultPrefStore()) { |
| 14 } | 14 } |
| 15 | 15 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 orig_type != base::Value::TYPE_BINARY) << | 55 orig_type != base::Value::TYPE_BINARY) << |
| 56 "invalid preference type: " << orig_type; | 56 "invalid preference type: " << orig_type; |
| 57 DCHECK(!defaults_->GetValue(path, NULL)) << | 57 DCHECK(!defaults_->GetValue(path, NULL)) << |
| 58 "Trying to register a previously registered pref: " << path; | 58 "Trying to register a previously registered pref: " << path; |
| 59 | 59 |
| 60 defaults_->SetDefaultValue(path, default_value); | 60 defaults_->SetDefaultValue(path, default_value); |
| 61 | 61 |
| 62 if (!registration_callback_.is_null()) | 62 if (!registration_callback_.is_null()) |
| 63 registration_callback_.Run(path, default_value); | 63 registration_callback_.Run(path, default_value); |
| 64 } | 64 } |
| OLD | NEW |