Many changes to DictionaryValues:...

chrome/common/extensions/extension_message_bundle.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension_message_bundle.h"
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
@@ skipping 32 matching lines @@
   if (!message_bundle->Init(locale_catalogs, error))
     return NULL;
 
   return message_bundle.release();
 }
 
 bool ExtensionMessageBundle::Init(const CatalogVector& locale_catalogs,
                                   std::string* error) {
   dictionary_.clear();
 
-  CatalogVector::const_reverse_iterator it = locale_catalogs.rbegin();
-  for (; it != locale_catalogs.rend(); ++it) {
+  for (CatalogVector::const_reverse_iterator it = locale_catalogs.rbegin();
+       it != locale_catalogs.rend(); ++it) {
     DictionaryValue* catalog = (*it).get();
-    DictionaryValue::key_iterator key_it = catalog->begin_keys();
-    for (; key_it != catalog->end_keys(); ++key_it) {
+    for (DictionaryValue::key_iterator key_it = catalog->begin_keys();
+         key_it != catalog->end_keys(); ++key_it) {
       std::string key(StringToLowerASCII(WideToUTF8(*key_it)));
       if (!IsValidName(*key_it))
         return BadKeyMessage(key, error);
       std::string value;
       if (!GetMessageValue(*key_it, *catalog, &value, error))
         return false;
       // Keys are not case-sensitive.
       dictionary_[key] = value;
     }
   }
 
   return true;
 }
 
 bool ExtensionMessageBundle::GetMessageValue(const std::wstring& wkey,
                                              const DictionaryValue& catalog,
                                              std::string* value,
                                              std::string* error) const {
   std::string key(WideToUTF8(wkey));
   // Get the top level tree for given key (name part).
   DictionaryValue* name_tree;
-  if (!catalog.GetDictionary(wkey, &name_tree)) {
+  if (!catalog.GetDictionaryWithoutPathExpansion(wkey, &name_tree)) {
     *error = StringPrintf("Not a valid tree for key %s.", key.c_str());
     return false;
   }
   // Extract message from it.
   if (!name_tree->GetString(kMessageKey, value)) {
     *error = StringPrintf("There is no \"%s\" element for key %s.",
                           WideToUTF8(kMessageKey).c_str(),
                           key.c_str());
     return false;
   }
@@ skipping 20 matching lines @@
 
   DictionaryValue* placeholders_tree;
   if (!name_tree.GetDictionary(kPlaceholdersKey, &placeholders_tree)) {
     *error = StringPrintf("Not a valid \"%s\" element for key %s.",
                           WideToUTF8(kPlaceholdersKey).c_str(),
                           name_key.c_str());
     return false;
   }
 
   for (DictionaryValue::key_iterator key_it = placeholders_tree->begin_keys();
-       key_it != placeholders_tree->end_keys();
-       ++key_it) {
+       key_it != placeholders_tree->end_keys(); ++key_it) {
     DictionaryValue* placeholder;
     std::string content_key = WideToUTF8(*key_it);
     if (!IsValidName(*key_it))
       return BadKeyMessage(content_key, error);
-    if (!placeholders_tree->GetDictionary(*key_it, &placeholder)) {
+    if (!placeholders_tree->GetDictionaryWithoutPathExpansion(*key_it,
+                                                              &placeholder)) {
       *error = StringPrintf("Invalid placeholder %s for key %s",
                             content_key.c_str(),
                             name_key.c_str());
       return false;
     }
     std::string content;
     if (!placeholder->GetString(kContentKey, &content)) {
       *error = StringPrintf("Invalid \"%s\" element for key %s.",
                             WideToUTF8(kContentKey).c_str(),
                             name_key.c_str());
@@ skipping 100 matching lines @@
 std::string ExtensionMessageBundle::GetL10nMessage(
     const std::string& name, const SubstitutionMap& dictionary) {
   SubstitutionMap::const_iterator it =
     dictionary.find(StringToLowerASCII(name));
   if (it != dictionary.end()) {
     return it->second;
   }
 
   return "";
 }