Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Relanding original CL 137734, http://codereview.chromium.org/10387010/.

TBR=aa,abodenha,ben,sail,tony

BUG=123611
TEST=All try bots pass and aura runs without errors.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=138769

[flackr, 2012-05-18 14:24:32]

This had to be reverted because a change had gone in in the meantime where the
data pack's scale factor was passed to ImageSkia. Patchset 1 is the original
change and patchset 2 is the fix to pass the float scale factor to ImageSkia.
Just a minor change, PTAL, thanks!

[flackr, 2012-05-22 13:09:22]

sky, ping. Can you take a look at patch set 2? Thanks!

On 2012/05/18 14:24:32, flackr wrote:
> This had to be reverted because a change had gone in in the meantime where the
> data pack's scale factor was passed to ImageSkia. Patchset 1 is the original
> change and patchset 2 is the fix to pass the float scale factor to ImageSkia.
> Just a minor change, PTAL, thanks!

[sky, 2012-05-22 15:49:44]

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.cc
File ui/base/layout.cc (right):

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.cc#newcode83
ui/base/layout.cc:83: return kScaleFactorScales[scale_factor];
If you're going to use ScaleFactor as an index into an array document this in
ScaleFactor and explicitly set the values.

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.h
File ui/base/layout.h (right):

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.h#newcode40
ui/base/layout.h:40: UI_EXPORT float GetScaleFactorScale(ScaleFactor
scale_factor);
Add a description of what this does.

[flackr, 2012-05-22 17:29:39]

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.cc
File ui/base/layout.cc (right):

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.cc#newcode83
ui/base/layout.cc:83: return kScaleFactorScales[scale_factor];
On 2012/05/22 15:49:45, sky wrote:
> If you're going to use ScaleFactor as an index into an array document this in
> ScaleFactor and explicitly set the values.

Done.

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.h
File ui/base/layout.h (right):

http://codereview.chromium.org/10412004/diff/2001/ui/base/layout.h#newcode40
ui/base/layout.h:40: UI_EXPORT float GetScaleFactorScale(ScaleFactor
scale_factor);
On 2012/05/22 15:49:45, sky wrote:
> Add a description of what this does.

Done.

[sky, 2012-05-22 17:51:44]

LGTM

[commit-bot: I haz the power, 2012-05-22 20:33:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10412004/6003

[commit-bot: I haz the power, 2012-05-23 01:26:27]

Try job failure for 10412004-6003 (retry) on win_rel for step "sync_unit_tests".
It's a second try, previously, steps "browser_tests, sync_unit_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2012-05-23 13:54:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10412004/6003

[commit-bot: I haz the power, 2012-05-23 13:55:23]

Failed to apply patch for ui/base/resource/resource_bundle_aurax11.cc:
While running patch -p1 --forward --force;
patching file ui/base/resource/resource_bundle_aurax11.cc
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- saving rejects to file
ui/base/resource/resource_bundle_aurax11.cc.rej

[commit-bot: I haz the power, 2012-05-23 21:30:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10412004/17001

[commit-bot: I haz the power, 2012-05-23 21:34:20]

Try job failure for 10412004-17001 on win for step "update".
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...

Step "update" is always a major failure.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-05-24 04:01:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/flackr@chromium.org/10412004/17001

[commit-bot: I haz the power, 2012-05-24 11:05:04]

Change committed as 138769