chrome/browser/icon_loader_chromeos.cc - Issue 10387010: Select theme resources from ResourceBundle at requested scale factor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/icon_loader_chromeos.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:

Index: chrome/browser/icon_loader_chromeos.cc

diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc

index 14692be13eadafdf476416ffb2e37108418d9ca4..cb99847903fdbffe2816e4d7d5dda0f391b21df1 100644

--- a/chrome/browser/icon_loader_chromeos.cc

+++ b/chrome/browser/icon_loader_chromeos.cc

@@ -17,6 +17,7 @@

#include "skia/ext/image_operations.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/base/resource/resource_handle.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/codec/png_codec.h"

#include "ui/gfx/image/image.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::ResourceHandle::kScaleFactor100x));

DCHECK(bytes.get());

SkBitmap bitmap;

if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap))