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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. Created 8 years, 7 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 f9be8372dce9bf43da54262eb1336f4dbb2ca287..b72592ce9395d796e0574d1e8df0246320fe7110 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -22,6 +22,7 @@
#include "grit/theme_resources_standard.h"
#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
#include "ui/gfx/image/image_skia.h"
#if defined(OS_WIN) && !defined(USE_AURA)
@@ -324,7 +325,7 @@ base::RefCountedMemory* ThemeService::GetRawData(int id) const {
if (theme_pack_.get())
data = theme_pack_->GetRawData(id);
if (!data)
- data = rb_.LoadDataResourceBytes(id);
+ data = rb_.LoadDataResourceBytes(id, ui::ResourceHandle::kScaleFactor100x);
return data;
}

Powered by Google App Engine
This is Rietveld 408576698