From d0b262357d1a64abd8b20721d484d7d778a4aceb Mon Sep 17 00:00:00 2001 From: "pneubeck@chromium.org" Date: Tue, 26 Feb 2013 11:58:07 +0000 Subject: Replacing DictionaryValue::key_iterator by DictionaryValue::Iterator in chrome/browser/{chromeos,web_resource}. This is one of several CLs of a larger refactoring that prepares for the removal of key_iterator. BUG=162611 Review URL: https://chromiumcodereview.appspot.com/12319095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184626 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/web_resource/notification_promo.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'chrome/browser/web_resource') diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc index e5055e2..7e942fb 100644 --- a/chrome/browser/web_resource/notification_promo.cc +++ b/chrome/browser/web_resource/notification_promo.cc @@ -143,7 +143,8 @@ base::Value* DeepCopyAndResolveStrings( const base::ListValue* list = static_cast(node); base::ListValue* copy = new base::ListValue; for (base::ListValue::const_iterator it = list->begin(); - it != list->end(); ++it) { + it != list->end(); + ++it) { base::Value* child_copy = DeepCopyAndResolveStrings(*it, strings); copy->Append(child_copy); } @@ -154,13 +155,12 @@ base::Value* DeepCopyAndResolveStrings( const base::DictionaryValue* dict = static_cast(node); base::DictionaryValue* copy = new base::DictionaryValue; - for (base::DictionaryValue::key_iterator it = dict->begin_keys(); - it != dict->end_keys(); ++it) { - const base::Value* child = NULL; - bool rv = dict->GetWithoutPathExpansion(*it, &child); - DCHECK(rv); - base::Value* child_copy = DeepCopyAndResolveStrings(child, strings); - copy->SetWithoutPathExpansion(*it, child_copy); + for (base::DictionaryValue::Iterator it(*dict); + !it.IsAtEnd(); + it.Advance()) { + base::Value* child_copy = DeepCopyAndResolveStrings(&it.value(), + strings); + copy->SetWithoutPathExpansion(it.key(), child_copy); } return copy; } -- cgit v1.1