Move 'theme' parsing out of Extension class

chrome/common/extensions/api/themes/theme_handler.h

Index: chrome/common/extensions/api/themes/theme_handler.h
diff --git a/chrome/common/extensions/api/themes/theme_handler.h b/chrome/common/extensions/api/themes/theme_handler.h
new file mode 100644
index 0000000000000000000000000000000000000000..1f8806adb28a859ad62c88611f249737de482454
--- /dev/null
+++ b/chrome/common/extensions/api/themes/theme_handler.h
@@ -0,0 +1,55 @@
+// 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_API_THEMES_THEME_HANDLER_H_
+#define CHROME_COMMON_EXTENSIONS_API_THEMES_THEME_HANDLER_H_
+
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace extensions {
+
+// A structure to hold the parsed theme data.
+struct ThemeInfo : public Extension::ManifestData {
+  // Define out of line constructor/destructor to please Clang.
+  ThemeInfo();
+  virtual ~ThemeInfo();
+
+  static base::DictionaryValue* GetThemeImages(const Extension* extension);
+  static base::DictionaryValue* GetThemeColors(const Extension* extension);
+  static base::DictionaryValue* GetThemeTints(const Extension* extension);
+  static base::DictionaryValue* GetThemeDisplayProperties(
+      const Extension* extension);
+
+  // 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_;
+};
+
+// Parses the "theme" manifest key.
+class ThemeHandler : public ManifestHandler {
+ public:
+  ThemeHandler();
+  virtual ~ThemeHandler();
+
+  virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(ThemeHandler);

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

DISALLOW_COPY_AND_ASSIGN() only works if it's declared in the private section of
a class (it's just a macro that the copy constructor and assignment operator for
a class;
https://code.google.com/searchframe#OAMlx_jo-ck/src/base/basictypes.h&exact_p...).

[Joe Thomas, 2013/01/30 23:15:19]

Ok. Removed.

[Devlin, 2013/01/30 23:36:33]

This shouldn't be removed; it should be declared in the private: section of a
class, i.e.
class ThemeHandler : public Manifest Handler {
 public:
  ThemeHandler();
  virtual ~ThemeHandler();

  virtual bool Parse(Extension* extension, string16* error) OVERRIDE;

 private:
  DISALLOW_COPY_AND_ASSIGN(ThemeHandler);
};

+};
+
+}  // namespace extensions
+
+#endif  // CHROME_COMMON_EXTENSIONS_API_THEMES_THEME_HANDLER_H_