summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/downloads_ui.cc
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:05:40 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 21:05:40 +0000
commitbebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f (patch)
tree2858dc6858da0f4c70b7d4fa2d11ba02ca83fde6 /chrome/browser/ui/webui/downloads_ui.cc
parentc145c83565c8c019f97d0280d12c623352e1c58e (diff)
downloadchromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.zip
chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.gz
chromium_src-bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f.tar.bz2
Select theme resources from ResourceBundle at requested scale factor.
Return the best match for a requested scale factor when fetching raw image data from ResourceBundle. TBR=aa,abodenha BUG=123611 TEST=ResourceBundle.LoadImageResourceBytes Review URL: https://chromiumcodereview.appspot.com/10387010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/downloads_ui.cc')
-rw-r--r--chrome/browser/ui/webui/downloads_ui.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc
index efc035b..57b7f7a 100644
--- a/chrome/browser/ui/webui/downloads_ui.cc
+++ b/chrome/browser/ui/webui/downloads_ui.cc
@@ -24,6 +24,7 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/theme_resources_standard.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
using content::DownloadManager;
@@ -103,5 +104,6 @@ DownloadsUI::DownloadsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
// static
base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes() {
return ResourceBundle::GetSharedInstance().
- LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON);
+ LoadDataResourceBytes(IDR_DOWNLOADS_FAVICON,
+ ui::SCALE_FACTOR_NONE);
}