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

Unified Diff: base/values.h

Issue 2027010: Preference provider implementation backed by JSON files in a directory. (Closed)
Patch Set: A few more fixes. Created 10 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/values.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/values.h
diff --git a/base/values.h b/base/values.h
index 248fc1d6e9d65620cd32d797964b91bb340b2f95..5c0ea336101323166057531827db23f24ae17e47 100644
--- a/base/values.h
+++ b/base/values.h
@@ -312,6 +312,12 @@ class DictionaryValue : public Value {
// the copy. This never returns NULL, even if |this| itself is empty.
DictionaryValue* DeepCopyWithoutEmptyChildren();
+ // Merge a given dictionary into this dictionary. This is done recursively,
+ // i.e. any subdictionaries will be merged as well. In case of key collisions,
+ // the passed in dictionary takes precedence and data already present will be
+ // replaced.
+ void MergeDictionary(const DictionaryValue* dictionary);
+
// This class provides an iterator for the keys in the dictionary.
// It can't be used to modify the dictionary.
//
« no previous file with comments | « no previous file | base/values.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698