components/prefs/pref_registry.cc - Issue 2539363004: Make base::Value::TYPE a scoped enum.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)

Patch Set: Rebase Created 4 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

« no previous file with comments | « components/prefs/pref_member.cc ('k') | components/prefs/pref_service.h » ('j') | no next file with comments »

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 "components/prefs/pref_registry.h"	5 #include "components/prefs/pref_registry.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/memory/ptr_util.h"	8 #include "base/memory/ptr_util.h"

9 #include "base/stl_util.h"	9 #include "base/stl_util.h"

10 #include "base/values.h"	10 #include "base/values.h"

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 DCHECK(value->IsType(current_value->GetType()))	47 DCHECK(value->IsType(current_value->GetType()))

48 << "Wrong type for new default: " << pref_name;	48 << "Wrong type for new default: " << pref_name;

49	49

50 defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));	50 defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));

51 }	51 }

52	52

53 void PrefRegistry::RegisterPreference(const std::string& path,	53 void PrefRegistry::RegisterPreference(const std::string& path,

54 base::Value* default_value,	54 base::Value* default_value,

55 uint32_t flags) {	55 uint32_t flags) {

56 base::Value::Type orig_type = default_value->GetType();	56 base::Value::Type orig_type = default_value->GetType();

57 DCHECK(orig_type != base::Value::TYPE_NULL &&	57 DCHECK(orig_type != base::Value::Type::NONE &&

58 orig_type != base::Value::TYPE_BINARY) <<	58 orig_type != base::Value::Type::BINARY) <<

59 "invalid preference type: " << orig_type;	59 "invalid preference type: " << orig_type;

60 DCHECK(!defaults_->GetValue(path, NULL)) <<	60 DCHECK(!defaults_->GetValue(path, NULL)) <<

61 "Trying to register a previously registered pref: " << path;	61 "Trying to register a previously registered pref: " << path;

62 DCHECK(!base::ContainsKey(registration_flags_, path))	62 DCHECK(!base::ContainsKey(registration_flags_, path))

63 << "Trying to register a previously registered pref: " << path;	63 << "Trying to register a previously registered pref: " << path;

64	64

65 defaults_->SetDefaultValue(path, base::WrapUnique(default_value));	65 defaults_->SetDefaultValue(path, base::WrapUnique(default_value));

66 if (flags != NO_REGISTRATION_FLAGS)	66 if (flags != NO_REGISTRATION_FLAGS)

67 registration_flags_[path] = flags;	67 registration_flags_[path] = flags;

68 }	68 }

OLD	NEW