Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 10783015: Add ability to store hidpi theme images in data pack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/theme_service.cc
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 331eb239ec52b097e27fc98df10e926dcfbdfba9..9d17adca37f846138c49544a54455bc8f62df867 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -336,7 +336,9 @@ bool ThemeService::HasCustomImage(int id) const {
return false;
}
-base::RefCountedMemory* ThemeService::GetRawData(int id) const {
+base::RefCountedMemory* ThemeService::GetRawData(
+ int id,
+ ui::ScaleFactor scale_factor) const {
// Check to see whether we should substitute some images.
int ntp_alternate;
GetDisplayProperty(NTP_LOGO_ALTERNATE, &ntp_alternate);
@@ -345,7 +347,7 @@ base::RefCountedMemory* ThemeService::GetRawData(int id) const {
base::RefCountedMemory* data = NULL;
if (theme_pack_.get())
- data = theme_pack_->GetRawData(id);
+ data = theme_pack_->GetRawData(id, scale_factor);
if (!data)
data = rb_.LoadDataResourceBytes(id, ui::SCALE_FACTOR_100P);
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698