summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history
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/history
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/history')
-rw-r--r--chrome/browser/history/top_sites.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 9dab604..779fe3b 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -39,6 +39,7 @@
#include "grit/locale_settings.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_util.h"
@@ -254,7 +255,8 @@ bool TopSites::GetPageThumbnail(const GURL& url,
for (size_t i = 0; i < arraysize(kPrepopulatedPages); i++) {
if (url.spec() == l10n_util::GetStringUTF8(kPrepopulatedPages[i].url_id)) {
*bytes = ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
- kPrepopulatedPages[i].thumbnail_id);
+ kPrepopulatedPages[i].thumbnail_id,
+ ui::SCALE_FACTOR_100P);
return true;
}
}