chrome/browser/prefs/pref_value_map.h - Issue 8139029: Make policy errors available to display in about:policy.

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

Unified Diff: chrome/browser/prefs/pref_value_map.h

Issue 8139029: Make policy errors available to display in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix bad commit Created 9 years, 2 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:

Index: chrome/browser/prefs/pref_value_map.h

diff --git a/chrome/browser/prefs/pref_value_map.h b/chrome/browser/prefs/pref_value_map.h

index f8995ce386fe9af6003cafb44942dc234154a488..2f6453bc0ebcdd2db361f1dcd3d91a3d7e2fb2e2 100644

--- a/chrome/browser/prefs/pref_value_map.h

+++ b/chrome/browser/prefs/pref_value_map.h

@@ -71,6 +71,10 @@ class PrefValueMap {

void GetDifferingKeys(const PrefValueMap* other,

std::vector<std::string>* differing_keys) const;

+ // Copies all entries in |other| to this value map. Overwrites any existing

+ // value if a key already exists in this value map.

+ void MergeFrom(const PrefValueMap* other);

private:

typedef std::map<std::string, base::Value*> Map;