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

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

Issue 1653693002: Move base/prefs to components/prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iOS fix Created 4 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
« no previous file with comments | « components/prefs/pref_registry.h ('k') | components/prefs/pref_registry_simple.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/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 "invalid preference type: " << orig_type; 58 "invalid preference type: " << orig_type;
59 DCHECK(!defaults_->GetValue(path, NULL)) << 59 DCHECK(!defaults_->GetValue(path, NULL)) <<
60 "Trying to register a previously registered pref: " << path; 60 "Trying to register a previously registered pref: " << path;
61 DCHECK(!ContainsKey(registration_flags_, path)) << 61 DCHECK(!ContainsKey(registration_flags_, path)) <<
62 "Trying to register a previously registered pref: " << path; 62 "Trying to register a previously registered pref: " << path;
63 63
64 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value)); 64 defaults_->SetDefaultValue(path, make_scoped_ptr(default_value));
65 if (flags != NO_REGISTRATION_FLAGS) 65 if (flags != NO_REGISTRATION_FLAGS)
66 registration_flags_[path] = flags; 66 registration_flags_[path] = flags;
67 } 67 }
OLDNEW
« no previous file with comments | « components/prefs/pref_registry.h ('k') | components/prefs/pref_registry_simple.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698