diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:05:40 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 21:05:40 +0000 |
| commit | bebfb2ed2025f1e0f99dbcf3aa9af48cc6e8ac0f (patch) | |
| tree | 2858dc6858da0f4c70b7d4fa2d11ba02ca83fde6 /chrome/browser/icon_loader_chromeos.cc | |
| parent | c145c83565c8c019f97d0280d12c623352e1c58e (diff) | |
| download | chromium_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/icon_loader_chromeos.cc')
| -rw-r--r-- | chrome/browser/icon_loader_chromeos.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc index cc4739f..fbd87ad 100644 --- a/chrome/browser/icon_loader_chromeos.cc +++ b/chrome/browser/icon_loader_chromeos.cc @@ -16,6 +16,7 @@ #include "grit/component_extension_resources.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/codec/png_codec.h" @@ -197,7 +198,7 @@ void IconLoader::ReadIcon() { int idr = icon_mapper.Get().Lookup(group_, icon_size_); ResourceBundle& rb = ResourceBundle::GetSharedInstance(); scoped_refptr<base::RefCountedStaticMemory> bytes( - rb.LoadDataResourceBytes(idr)); + rb.LoadDataResourceBytes(idr, ui::SCALE_FACTOR_100P)); DCHECK(bytes.get()); SkBitmap bitmap; if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap)) |