diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 20:48:07 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-14 20:48:07 +0000 |
| commit | f017cc9f926a81638e324b51bd418ac7f7feeee0 (patch) | |
| tree | 8db77306164b5d4498eac4ae729753095430a2e5 /chrome/browser/cocoa/download_shelf_controller.mm | |
| parent | 3396dc0d719aeca9d4593dfe0f1ab62cdac1629f (diff) | |
| download | chromium_src-f017cc9f926a81638e324b51bd418ac7f7feeee0.zip chromium_src-f017cc9f926a81638e324b51bd418ac7f7feeee0.tar.gz chromium_src-f017cc9f926a81638e324b51bd418ac7f7feeee0.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/cocoa/download_shelf_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/download_shelf_controller.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/download_shelf_controller.mm b/chrome/browser/cocoa/download_shelf_controller.mm index 5d494fc..ae9395b 100644 --- a/chrome/browser/cocoa/download_shelf_controller.mm +++ b/chrome/browser/cocoa/download_shelf_controller.mm @@ -114,10 +114,12 @@ const NSTimeInterval kDownloadShelfCloseDuration = 0.12; BOOL useDefaultColor = YES; if (bridge_.get() && bridge_->browser() && bridge_->browser()->profile()) { ThemeProvider* provider = bridge_->browser()->profile()->GetThemeProvider(); - if (provider) + if (provider) { useDefaultColor = provider->GetColor( BrowserThemeProvider::COLOR_BOOKMARK_TEXT) == - BrowserThemeProvider::kDefaultColorBookmarkText; + BrowserThemeProvider::GetDefaultColor( + BrowserThemeProvider::COLOR_BOOKMARK_TEXT); + } } NSColor* color = useDefaultColor ? |