Index: chrome/browser/themes/theme_service.cc |
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc |
index 053cfb89c26a91125ec60624a12776b5f9e38d57..8c5c9b698c5d11f92929e14b6a117370274ee102 100644 |
--- a/chrome/browser/themes/theme_service.cc |
+++ b/chrome/browser/themes/theme_service.cc |
@@ -236,13 +236,8 @@ bool ThemeService::ShouldUseNativeFrame() const { |
} |
bool ThemeService::HasCustomImage(int id) const { |
- if (!Properties::IsThemeableImage(id)) |
- return false; |
- |
- if (theme_supplier_.get()) |
- return theme_supplier_->HasCustomImage(id); |
- |
- return false; |
+ return BrowserThemePack::IsPersistentImageID(id) && |
+ theme_supplier_ && theme_supplier_->HasCustomImage(id); |
} |
base::RefCountedMemory* ThemeService::GetRawData( |