4 files changed, 18 insertions, 0 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index cdf484b..4c2914e 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -34,6 +34,7 @@ const wchar_t* Extension::kThemeKey = L"theme";
 const wchar_t* Extension::kThemeImagesKey = L"images";
 const wchar_t* Extension::kThemeColorsKey = L"colors";
 const wchar_t* Extension::kThemeTintsKey = L"tints";
+const wchar_t* Extension::kThemeDisplayPropertiesKey = L"properties";
 const wchar_t* Extension::kToolstripsKey = L"toolstrips";
 const wchar_t* Extension::kTooltipKey = L"tooltip";
 const wchar_t* Extension::kTypeKey = L"type";
@@ -577,6 +578,13 @@ bool Extension::InitFromValue(const DictionaryValue& source, bool require_id,
           static_cast<DictionaryValue*>(tints_value->DeepCopy()));
     }
 
+    DictionaryValue* display_properties_value;
+    if (theme_value->GetDictionary(kThemeDisplayPropertiesKey,
+        &display_properties_value)) {
+      theme_display_properties_.reset(
+          static_cast<DictionaryValue*>(display_properties_value->DeepCopy()));
+    }
+
     return true;
   }
 
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 1256b17f..782b823 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -51,6 +51,7 @@ class Extension {
   static const wchar_t* kThemeImagesKey;
   static const wchar_t* kThemeColorsKey;
   static const wchar_t* kThemeTintsKey;
+  static const wchar_t* kThemeDisplayPropertiesKey;
   static const wchar_t* kToolstripsKey;
   static const wchar_t* kTooltipKey;
   static const wchar_t* kTypeKey;
@@ -161,6 +162,9 @@ class Extension {
   DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
   DictionaryValue* GetThemeColors() const { return theme_colors_.get(); }
   DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
+  DictionaryValue* GetThemeDisplayProperties() const {
+    return theme_display_properties_.get();
+  }
   bool IsTheme() { return is_theme_; }
 
  private:
@@ -238,6 +242,9 @@ class Extension {
   // A map of color names to colors.
   scoped_ptr<DictionaryValue> theme_tints_;
 
+  // A map of display properties.
+  scoped_ptr<DictionaryValue> theme_display_properties_;
+
   // Whether the extension is a theme - if it is, certain things are disabled.
   bool is_theme_;
 
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 9dd08c8..3ef102c 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -250,6 +250,8 @@ const wchar_t kCurrentThemeID[] = L"extensions.theme.id";
 const wchar_t kCurrentThemeImages[] = L"extensions.theme.images";
 const wchar_t kCurrentThemeColors[] = L"extensions.theme.colors";
 const wchar_t kCurrentThemeTints[] = L"extensions.theme.tints";
+const wchar_t kCurrentThemeDisplayProperties[] =
+    L"extensions.theme.display_properties";
 
 // Boolean that indicates whether we should check if we are the default browser
 // on start-up.
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 5979204..2114b0b 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -92,6 +92,7 @@ extern const wchar_t kCurrentThemeID[];
 extern const wchar_t kCurrentThemeImages[];
 extern const wchar_t kCurrentThemeColors[];
 extern const wchar_t kCurrentThemeTints[];
+extern const wchar_t kCurrentThemeDisplayProperties[];
 extern const wchar_t kCheckDefaultBrowser[];
 
 // Local state