Many changes to DictionaryValues:...

chrome/browser/browser_theme_provider.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/browser/browser_theme_provider.h"
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "base/file_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 1052 matching lines @@
 void BrowserThemeProvider::SetImageData(DictionaryValue* images_value,
                                         FilePath images_path) {
   images_.clear();
 
   if (!images_value)
     return;
 
   for (DictionaryValue::key_iterator iter(images_value->begin_keys());
        iter != images_value->end_keys(); ++iter) {
     std::string val;
-    if (images_value->GetString(*iter, &val)) {
+    if (images_value->GetStringWithoutPathExpansion(*iter, &val)) {
       int id = ThemeResourcesUtil::GetId(WideToUTF8(*iter));
       if (id != -1) {
         if (!images_path.empty()) {
           images_[id] =
               WideToUTF8(images_path.AppendASCII(val).ToWStringHack());
           resource_names_[id] = WideToASCII(*iter);
         } else {
           images_[id] = val;
         }
       }
     }
   }
 }
 
 void BrowserThemeProvider::SetColorData(DictionaryValue* colors_value) {
   colors_.clear();
 
   if (!colors_value)
     return;
 
   for (DictionaryValue::key_iterator iter(colors_value->begin_keys());
        iter != colors_value->end_keys(); ++iter) {
     ListValue* color_list;
-    if (colors_value->GetList(*iter, &color_list) &&
+    if (colors_value->GetListWithoutPathExpansion(*iter, &color_list) &&
         ((color_list->GetSize() == 3) || (color_list->GetSize() == 4))) {
       int r, g, b;
       color_list->GetInteger(0, &r);
       color_list->GetInteger(1, &g);
       color_list->GetInteger(2, &b);
       if (color_list->GetSize() == 4) {
         double alpha;
         int alpha_int;
         if (color_list->GetReal(3, &alpha)) {
           colors_[WideToUTF8(*iter)] =
@@ skipping 12 matching lines @@
 
 void BrowserThemeProvider::SetTintData(DictionaryValue* tints_value) {
   tints_.clear();
 
   if (!tints_value)
     return;
 
   for (DictionaryValue::key_iterator iter(tints_value->begin_keys());
        iter != tints_value->end_keys(); ++iter) {
     ListValue* tint_list;
-    if (tints_value->GetList(*iter, &tint_list) &&
+    if (tints_value->GetListWithoutPathExpansion(*iter, &tint_list) &&
         (tint_list->GetSize() == 3)) {
       color_utils::HSL hsl = { -1, -1, -1 };
       int value = 0;
       if (!tint_list->GetReal(0, &hsl.h) && tint_list->GetInteger(0, &value))
         hsl.h = value;
       if (!tint_list->GetReal(1, &hsl.s) &&  tint_list->GetInteger(1, &value))
         hsl.s = value;
       if (!tint_list->GetReal(2, &hsl.l) && tint_list->GetInteger(2, &value))
         hsl.l = value;
 
       tints_[WideToUTF8(*iter)] = hsl;
     }
   }
 }
 
 void BrowserThemeProvider::SetDisplayPropertyData(
     DictionaryValue* display_properties_value) {
   display_properties_.clear();
 
   if (!display_properties_value)
     return;
 
   for (DictionaryValue::key_iterator iter(
        display_properties_value->begin_keys());
        iter != display_properties_value->end_keys(); ++iter) {
     // New tab page alignment and background tiling.
     if (base::strcasecmp(WideToUTF8(*iter).c_str(),
                          kDisplayPropertyNTPAlignment) == 0) {
       std::string val;
-      if (display_properties_value->GetString(*iter, &val)) {
+      if (display_properties_value->GetStringWithoutPathExpansion(*iter,
+                                                                  &val)) {
         display_properties_[kDisplayPropertyNTPAlignment] =
             StringToAlignment(val);
       }
     } else if (base::strcasecmp(WideToUTF8(*iter).c_str(),
                                 kDisplayPropertyNTPTiling) == 0) {
       std::string val;
-      if (display_properties_value->GetString(*iter, &val)) {
-        display_properties_[kDisplayPropertyNTPTiling] =
-            StringToTiling(val);
-      }
+      if (display_properties_value->GetStringWithoutPathExpansion(*iter, &val))
+        display_properties_[kDisplayPropertyNTPTiling] = StringToTiling(val);
     }
     if (base::strcasecmp(WideToUTF8(*iter).c_str(),
                          kDisplayPropertyNTPInverseLogo) == 0) {
       int val = 0;
-      if (display_properties_value->GetInteger(*iter, &val))
+      if (display_properties_value->GetIntegerWithoutPathExpansion(*iter, &val))
         display_properties_[kDisplayPropertyNTPInverseLogo] = val;
     }
   }
 }
 
 SkBitmap* BrowserThemeProvider::GenerateTabBackgroundBitmap(int id) const {
   if (id == IDR_THEME_TAB_BACKGROUND ||
       id == IDR_THEME_TAB_BACKGROUND_INCOGNITO) {
     // The requested image is a background tab. Get a frame to create the
     // tab against. As themes don't use the glass frame, we don't have to
@@ skipping 24 matching lines @@
   DictionaryValue* pref_images =
       profile_->GetPrefs()->GetMutableDictionary(prefs::kCurrentThemeImages);
   pref_images->Clear();
 
   if (!images_value)
     return;
 
   for (DictionaryValue::key_iterator iter(images_value->begin_keys());
        iter != images_value->end_keys(); ++iter) {
     std::string val;
-    if (images_value->GetString(*iter, &val)) {
+    if (images_value->GetStringWithoutPathExpansion(*iter, &val)) {
       int id = ThemeResourcesUtil::GetId(WideToUTF8(*iter));
-      if (id != -1)
-        pref_images->SetString(*iter, images_.find(id)->second);
+      if (id != -1) {
+        pref_images->SetWithoutPathExpansion(*iter,
+            Value::CreateStringValue(images_.find(id)->second));
+      }
     }
   }
 }
 
 void BrowserThemeProvider::SaveColorData() const {
   // Save our color data.
   DictionaryValue* pref_colors =
       profile_->GetPrefs()->GetMutableDictionary(prefs::kCurrentThemeColors);
   pref_colors->Clear();
 
@@ skipping 99 matching lines @@
 }
 
 bool BrowserThemeProvider::ShouldTintFrames() const {
   return (HasCustomImage(IDR_THEME_FRAME) ||
       tints_.count(GetTintKey(TINT_BACKGROUND_TAB)) ||
       tints_.count(GetTintKey(TINT_FRAME)) ||
       tints_.count(GetTintKey(TINT_FRAME_INACTIVE)) ||
       tints_.count(GetTintKey(TINT_FRAME_INCOGNITO)) ||
       tints_.count(GetTintKey(TINT_FRAME_INCOGNITO_INACTIVE)));
 }