diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 22:09:55 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 22:09:55 +0000 |
| commit | 75cbb35fa7fb6ce0a511612ec91998c053247be8 (patch) | |
| tree | 5abee27b2c5f2c60e5017aa6c00b43d9fe2376f4 /chrome/browser/browser_theme_provider_mac.mm | |
| parent | 9fa8c2f5e9581c2e521fd28aadedc4c77b9b2150 (diff) | |
| download | chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.zip chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.tar.gz chromium_src-75cbb35fa7fb6ce0a511612ec91998c053247be8.tar.bz2 | |
Revert "Completely redo how themes are stored on disk and processed at install
time," as it fails valgrind tests.
This reverts commit 86faccd1028937a69ccc718718fd48c06c0cd471 (r34379).
Review URL: http://codereview.chromium.org/490025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34385 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider_mac.mm')
| -rw-r--r-- | chrome/browser/browser_theme_provider_mac.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/browser_theme_provider_mac.mm index ec3d4a8..65c2182 100644 --- a/chrome/browser/browser_theme_provider_mac.mm +++ b/chrome/browser/browser_theme_provider_mac.mm @@ -8,7 +8,6 @@ #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 { @@ -76,8 +75,9 @@ NSColor* BrowserThemeProvider::GetNSColor(int id) const { if (nscolor_iter != nscolor_cache_.end()) return nscolor_iter->second; - SkColor sk_color; - if (theme_pack_.get() && theme_pack_->GetColor(id, &sk_color)) { + ColorMap::const_iterator color_iter = colors_.find(GetColorKey(id)); + if (color_iter != colors_.end()) { + const SkColor& sk_color = color_iter->second; NSColor* color = [NSColor colorWithCalibratedRed:SkColorGetR(sk_color)/255.0 green:SkColorGetG(sk_color)/255.0 @@ -102,8 +102,9 @@ NSColor* BrowserThemeProvider::GetNSColorTint(int id) const { if (nscolor_iter != nscolor_cache_.end()) return nscolor_iter->second; - color_utils::HSL tint; - if (theme_pack_.get() && theme_pack_->GetTint(id, &tint)) { + TintMap::const_iterator tint_iter = tints_.find(GetTintKey(id)); + if (tint_iter != tints_.end()) { + color_utils::HSL tint = tint_iter->second; CGFloat hue, saturation, brightness; HSLToHSB(tint, &hue, &saturation, &brightness); |