chrome/browser/extensions/extension_icon_image.cc - Issue 211493009: Ensure that extension resources are loaded with the correct scaling applied on Windows.

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/extensions/extension_icon_image.cc

Issue 211493009: Ensure that extension resources are loaded with the correct scaling applied on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix try server errors Created 6 years, 9 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/extensions/extension_icon_image.cc

diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc

index 34c4ccb1eeb5e55c9ba3aab579b0a9694c14a547..293886ad9721c528afde10e4df03201af350d73c 100644

--- a/chrome/browser/extensions/extension_icon_image.cc

+++ b/chrome/browser/extensions/extension_icon_image.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/extensions/image_loader.h"

#include "content/public/browser/notification_service.h"

#include "extensions/common/extension.h"

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/canvas_image_source.h"

#include "ui/gfx/image/image.h"

@@ -164,7 +165,7 @@ gfx::ImageSkiaRep IconImage::LoadImageForScaleFactor(

if (!extension_)

return gfx::ImageSkiaRep();

- const float scale = ui::GetImageScale(scale_factor);

+ const float scale = ui::ResourceBundle::PlatformGetImageScale(scale_factor);

const int resource_size_in_pixel =

static_cast<int>(resource_size_in_dip_ * scale);

« no previous file with comments | « no previous file | chrome/browser/extensions/image_loader.cc » ('j') | ui/base/resource/resource_bundle.h » ('J')