Move 'theme' parsing out of Extension class

chrome/common/extensions/extension.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
@@ skipping 658 matching lines @@
   const URLPatternSet& web_extent() const { return extent_; }
   const std::string& launch_local_path() const { return launch_local_path_; }
   const std::string& launch_web_url() const { return launch_web_url_; }
   extension_misc::LaunchContainer launch_container() const {
     return launch_container_;
   }
   int launch_width() const { return launch_width_; }
   int launch_height() const { return launch_height_; }
 
   // 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 {
     return content_security_policy_;
   }
 
   // Content pack related.
   bool is_content_pack() const;
   ExtensionResource GetContentPackSiteList() const;
 
@@ skipping 106 matching lines @@
       string16* error);
   bool LoadExtensionFeatures(APIPermissionSet* api_permissions,
                              string16* error);
   bool LoadContentScripts(string16* error);
   bool LoadPageAction(string16* error);
   bool LoadBrowserAction(string16* error);
   bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
   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,
       string16* error);
   bool LoadManagedModeConfigurations(
       const base::DictionaryValue* content_pack_value,
       string16* error);
 
   // Helper function for implementing HasCachedImage/GetCachedImage. A return
   // value of NULL means there is no matching image cached (we allow caching an
@@ skipping 153 matching lines @@
 
   // True if the background page can be scripted by pages of the app or
   // extension, in which case all such pages must run in the same process.
   // False if such pages are not permitted to script the background page,
   // allowing them to run in different processes.
   bool allow_background_js_access_;
 
   // 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_;
 
   // The manifest from which this extension was created.
   scoped_ptr<Manifest> manifest_;
 
   // Stored parsed manifest data.
   ManifestDataMap manifest_data_;
 
   // Set to true at the end of InitValue when initialization is finished.
@@ skipping 111 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_