Try 2: Completely redo how themes are stored on disk and processed at install time.

Same as previous patch, except we now have a
BrowserThemeProvider::GetDefaultDisplayProperty() so we don't have UMRs in
ntp_resource_cache.cc.

BUG=24493,21121
TEST=All the new unit tests pass. All the complex theme startup tests go faster.

Previous Review URL: http://codereview.chromium.org/460050

Review URL: http://codereview.chromium.org/499004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34486 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/browser_theme_provider_mac.mm
index 65c2182..ec3d4a8 100644
--- a/chrome/browser/browser_theme_provider_mac.mm
+++ b/chrome/browser/browser_theme_provider_mac.mm
@@ -8,6 +8,7 @@
 
 #include "app/gfx/color_utils.h"
 #include "base/logging.h"
+#include "chrome/browser/browser_theme_pack.h"
 #include "skia/ext/skia_utils_mac.h"
 
 namespace {
@@ -75,9 +76,8 @@ NSColor* BrowserThemeProvider::GetNSColor(int id) const {
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
-  ColorMap::const_iterator color_iter = colors_.find(GetColorKey(id));
-  if (color_iter != colors_.end()) {
-    const SkColor& sk_color = color_iter->second;
+  SkColor sk_color;
+  if (theme_pack_.get() && theme_pack_->GetColor(id, &sk_color)) {
     NSColor* color = [NSColor
         colorWithCalibratedRed:SkColorGetR(sk_color)/255.0
                          green:SkColorGetG(sk_color)/255.0
@@ -102,9 +102,8 @@ NSColor* BrowserThemeProvider::GetNSColorTint(int id) const {
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
-  TintMap::const_iterator tint_iter = tints_.find(GetTintKey(id));
-  if (tint_iter != tints_.end()) {
-    color_utils::HSL tint = tint_iter->second;
+  color_utils::HSL tint;
+  if (theme_pack_.get() && theme_pack_->GetTint(id, &tint)) {
     CGFloat hue, saturation, brightness;
     HSLToHSB(tint, &hue, &saturation, &brightness);