Ensure that extension resources are loaded with the correct scaling applied on Windows.

Ensure that extension resources are loaded with the correct scaling applied on Windows.

We were loading the icons with the scaling factor based on the loaded resource pak, which works on
all platforms except on Windows with high dpi enabled with dpi settings other than 100% or 200%.

Fix is to pass in the correct scaling factor when loading these resources like icons etc which ensures that
they get resized correctly.

I made the PlatformGetImageScale function in the ResourceBundle class static and passed in the loaded scale factor
to it. This function returns the correct scale to be used as before. We call this function from the extensions resource
loading code.

There may be other places which need similar fixes. Will address those in upcoming CL's

BUG=351170, 354706
R=sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260254

[ananta, 2014-03-26 02:46:48]

sky for overall review.
benwells for extensions

[sky, 2014-03-26 13:45:37]

It is possible to move this implementation into ui::GetImageScale?

https://codereview.chromium.org/211493009/diff/60001/ui/base/resource/resourc...
File ui/base/resource/resource_bundle.h (right):

https://codereview.chromium.org/211493009/diff/60001/ui/base/resource/resourc...
ui/base/resource/resource_bundle.h:263: static float
PlatformGetImageScale(ui::ScaleFactor scale_factor);
This name is wordy (it was before, but when private it wasn't as much an issue).
How about GetScaleForImages()?

[sky, 2014-03-26 13:45:48]

That should be, 'is it possible'.

[ananta, 2014-03-26 19:40:09]

https://codereview.chromium.org/211493009/diff/60001/ui/base/resource/resourc...
File ui/base/resource/resource_bundle.h (right):

https://codereview.chromium.org/211493009/diff/60001/ui/base/resource/resourc...
ui/base/resource/resource_bundle.h:263: static float
PlatformGetImageScale(ui::ScaleFactor scale_factor);
On 2014/03/26 13:45:37, sky wrote:
> This name is wordy (it was before, but when private it wasn't as much an
issue).
> How about GetScaleForImages()?

Removed this function. Moved this logic to ui::GetImageScale as per your
suggestion. Makes things simpler. I added a new function in layout.cc
GetImageScaleForScaleFactor which retains the old behavior. This is called from
resource_bundle.cc when images are being loaded.

[sky, 2014-03-26 20:43:26]

https://codereview.chromium.org/211493009/diff/130001/ui/base/layout.cc
File ui/base/layout.cc (right):

https://codereview.chromium.org/211493009/diff/130001/ui/base/layout.cc#newco...
ui/base/layout.cc:121: return kScaleFactorScales[scale_factor];
Is it possible to make this private too? It's confusing to have two so similar
functions.

[ananta, 2014-03-26 21:49:26]

https://codereview.chromium.org/211493009/diff/130001/ui/base/layout.cc
File ui/base/layout.cc (right):

https://codereview.chromium.org/211493009/diff/130001/ui/base/layout.cc#newco...
ui/base/layout.cc:121: return kScaleFactorScales[scale_factor];
On 2014/03/26 20:43:27, sky wrote:
> Is it possible to make this private too? It's confusing to have two so similar
> functions.

As per our discussion, moved the kScaleFactorScales array to layout.h and
renamed it g_kScaleFactorScales. ResourceBundle uses it as well. Removed the
GetImageScaleForScaleFactor function. Verified that favicons, etc don't use the
array directly.

[benwells, 2014-03-27 02:01:59]

There are no extensions changes now so removing myself as reviewer :)

[sky, 2014-03-27 15:43:06]

https://codereview.chromium.org/211493009/diff/140001/ui/base/layout.h
File ui/base/layout.h (right):

https://codereview.chromium.org/211493009/diff/140001/ui/base/layout.h#newcode51
ui/base/layout.h:51: extern float g_kScaleFactorScales[NUM_SCALE_FACTORS];
I don't like exposing this. For one it isn't const, which may be problematic.
How about a function GetScaleForScaleFactor()?

[ananta, 2014-03-27 19:05:07]

https://codereview.chromium.org/211493009/diff/140001/ui/base/layout.h
File ui/base/layout.h (right):

https://codereview.chromium.org/211493009/diff/140001/ui/base/layout.h#newcode51
ui/base/layout.h:51: extern float g_kScaleFactorScales[NUM_SCALE_FACTORS];
On 2014/03/27 15:43:07, sky wrote:
> I don't like exposing this. For one it isn't const, which may be problematic.
> How about a function GetScaleForScaleFactor()?

Done.

[sky, 2014-03-27 19:42:36]

LGTM

[ananta, 2014-03-28 20:27:23]

Committed patchset #9 manually as r260254 (presubmit successful).