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

Unified Diff: chrome/browser/ui/webui/web_ui_util.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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/ui/webui/web_ui_util.cc
diff --git a/chrome/browser/ui/webui/web_ui_util.cc b/chrome/browser/ui/webui/web_ui_util.cc
index 4ef88e0a872f8bfc49c3fc25cac18229a6801c51..46d282442f42f54b72767cf3380296e4518dce9f 100644
--- a/chrome/browser/ui/webui/web_ui_util.cc
+++ b/chrome/browser/ui/webui/web_ui_util.cc
@@ -11,6 +11,7 @@
#include "base/memory/ref_counted_memory.h"
#include "base/values.h"
#include "chrome/browser/disposition_utils.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/codec/png_codec.h"
@@ -30,7 +31,8 @@ std::string GetImageDataUrl(const SkBitmap& bitmap) {
std::string GetImageDataUrlFromResource(int res) {
// Load resource icon and covert to base64 encoded data url
base::RefCountedStaticMemory* icon_data =
- ResourceBundle::GetSharedInstance().LoadDataResourceBytes(res);
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes(res,
+ ui::SCALE_FACTOR_100P);
if (!icon_data)
return std::string();
scoped_refptr<base::RefCountedMemory> raw_icon(icon_data);

Powered by Google App Engine
This is Rietveld 408576698