Move 'theme' parsing out of Extension class

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 4c9986b055aba67ff5d6cb8136b4feab06db23aa..59c0931f97bcd5d87eaff5e4250cea22b1fc395b 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -677,12 +677,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
 
   // Theme-related.
   bool is_theme() const;

[Devlin, 2013/01/30 02:56:40]

Do we want to keep this in the Extension class? We could easily store it as a
bool in ThemeInfo, thereby removing all theme references from Extension main; is
there a reason to keep it here?

[Joe Thomas, 2013/01/30 18:15:39]

Since this is a function which returns the basic type of Extension object, I
thought it's better to be part of Extension class.

Yoyo@, what do you think?

[Yoyo Zhou, 2013/01/30 22:11:06]

This is a property of the manifest rather than the extension, so I'd recommend
leaving it here.

-  base::DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
-  base::DictionaryValue* GetThemeColors() const {return theme_colors_.get(); }
-  base::DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
-  base::DictionaryValue* GetThemeDisplayProperties() const {
-    return theme_display_properties_.get();
-  }
 
   // Content Security Policy!
   const std::string& content_security_policy() const {
@@ -809,17 +803,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   bool LoadTextToSpeechVoices(string16* error);
   bool LoadIncognitoMode(string16* error);
   bool LoadContentSecurityPolicy(string16* error);
-
-  bool LoadThemeFeatures(string16* error);
-  bool LoadThemeImages(const base::DictionaryValue* theme_value,
-                       string16* error);
-  bool LoadThemeColors(const base::DictionaryValue* theme_value,
-                       string16* error);
-  bool LoadThemeTints(const base::DictionaryValue* theme_value,
-                      string16* error);
-  bool LoadThemeDisplayProperties(const base::DictionaryValue* theme_value,
-                                  string16* error);
-
   bool LoadManagedModeFeatures(string16* error);
   bool LoadManagedModeSites(
       const base::DictionaryValue* content_pack_value,
@@ -993,18 +976,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // The public key used to sign the contents of the crx package.
   std::string public_key_;
 
-  // A map of resource id's to relative file paths.
-  scoped_ptr<base::DictionaryValue> theme_images_;
-
-  // A map of color names to colors.
-  scoped_ptr<base::DictionaryValue> theme_colors_;
-
-  // A map of color names to colors.
-  scoped_ptr<base::DictionaryValue> theme_tints_;
-
-  // A map of display properties.
-  scoped_ptr<base::DictionaryValue> theme_display_properties_;
-
   // A file containing a list of sites for Managed Mode.
   FilePath content_pack_site_list_;