Use scoped pointers for the theme information in an Extension.
Also includes http://codereview.chromium.org/115166 by Craig Schlenter
BUG=11692
Review URL: http://codereview.chromium.org/112012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15727 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension.h b/chrome/browser/extensions/extension.h
index 4e19c9a..02cb13c 100644
--- a/chrome/browser/extensions/extension.h
+++ b/chrome/browser/extensions/extension.h
@@ -124,9 +124,9 @@
return GetResourcePath(path(), relative_path);
}
- DictionaryValue* GetThemeImages() { return theme_images_; }
- DictionaryValue* GetThemeColors() { return theme_colors_; }
- DictionaryValue* GetThemeTints() { return theme_tints_; }
+ DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
+ DictionaryValue* GetThemeColors() const { return theme_colors_.get(); }
+ DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
bool IsTheme() { return is_theme_; }
// Initialize the extension from a parsed manifest.
@@ -214,13 +214,13 @@
std::string zip_hash_;
// A map of resource id's to relative file paths.
- DictionaryValue* theme_images_;
+ scoped_ptr<DictionaryValue> theme_images_;
// A map of color names to colors.
- DictionaryValue* theme_colors_;
+ scoped_ptr<DictionaryValue> theme_colors_;
// A map of color names to colors.
- DictionaryValue* theme_tints_;
+ scoped_ptr<DictionaryValue> theme_tints_;
// Whether the extension is a theme - if it is, certain things are disabled.
bool is_theme_;
