2x profile avatar icons (grd changes)

2x profile avatar icons (grd changes)

The actual icons are in this CL: http://codereview.chromium.org/10532189/

BUG=132910
TEST=

[Nico, 2012-06-18 06:12:16]

https://chromiumcodereview.appspot.com/10559029/diff/1/chrome/app/theme/theme...
File chrome/app/theme/theme_resources_touch_2x.grd (right):

https://chromiumcodereview.appspot.com/10559029/diff/1/chrome/app/theme/theme...
chrome/app/theme/theme_resources_touch_2x.grd:169: <if expr="not is_macosx">
I think you can assume "not mac" in _touch.grd, don't you think?

[sail, 2012-06-18 11:32:50]

https://chromiumcodereview.appspot.com/10559029/diff/1/chrome/app/theme/theme...
File chrome/app/theme/theme_resources_touch_2x.grd (right):

https://chromiumcodereview.appspot.com/10559029/diff/1/chrome/app/theme/theme...
chrome/app/theme/theme_resources_touch_2x.grd:169: <if expr="not is_macosx">
On 2012/06/18 06:12:16, Nico wrote:
> I think you can assume "not mac" in _touch.grd, don't you think?

Unfortunately all the conditionals in the GRD file have to be duplicated in all
4 GRDs. Even if the conditional always resolves to false the entries inside are
still used to increment the icon ID. Oshima and others are working on fixing
this.

[Nico, 2012-06-18 15:25:55]

I see. LGTM then.

[commit-bot: I haz the power, 2012-06-18 15:26:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/10559029/1

[commit-bot: I haz the power, 2012-06-18 15:41:59]

Try job failure for 10559029-1 (retry) on mac_rel for step "compile" (clobber
build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[oshima, 2012-06-18 16:35:49]

cc'ing benrg who is working on merging grd fiels.

[benrg, 2012-06-18 17:51:54]

Issue 10562030, which eliminates theme_resources_2x.grd and
theme_resources_touch_[12]x.grd, is in CQ. Assuming it lands before this, you
will need to use <structure> instead of <include> in
theme_resources_standard.grd (a simple regex replacement) and drop the changes
to the eliminated files.

[sail, 2012-06-18 20:22:09]

Rebased. benrg, could you take another look? Thanks

[benrg, 2012-06-18 20:32:44]

LGTM with changes below.

https://chromiumcodereview.appspot.com/10559029/diff/12003/chrome/app/theme/t...
File chrome/app/theme/theme_resources_standard.grd (right):

https://chromiumcodereview.appspot.com/10559029/diff/12003/chrome/app/theme/t...
chrome/app/theme/theme_resources_standard.grd:210: <structure
type="chrome_scaled_image"  name="IDR_PROFILE_AVATAR_0"
file="profile_avatar_generic.png" type="BINDATA" />
Remove type="BINDATA" (and, I suppose, the second space before name="...").

[sail, 2012-06-18 20:40:14]

https://chromiumcodereview.appspot.com/10559029/diff/12003/chrome/app/theme/t...
File chrome/app/theme/theme_resources_standard.grd (right):

https://chromiumcodereview.appspot.com/10559029/diff/12003/chrome/app/theme/t...
chrome/app/theme/theme_resources_standard.grd:210: <structure
type="chrome_scaled_image"  name="IDR_PROFILE_AVATAR_0"
file="profile_avatar_generic.png" type="BINDATA" />
On 2012/06/18 20:32:44, benrg wrote:
> Remove type="BINDATA" (and, I suppose, the second space before name="...").

Done.
Oops, good catch.

[commit-bot: I haz the power, 2012-06-18 20:41:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/10559029/22001

[commit-bot: I haz the power, 2012-06-18 21:03:19]

Try job failure for 10559029-22001 (retry) on linux_clang for step "compile"
(clobber build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_clan...

[commit-bot: I haz the power, 2012-06-19 06:18:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sail@chromium.org/10559029/24002

[commit-bot: I haz the power, 2012-06-19 06:40:12]

Try job failure for 10559029-24002 (retry) on mac_rel for step "compile"
(clobber build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Nico, 2012-06-19 21:14:22]

fyi, avi's landing a rebased version of this

[Avi (use Gerrit), 2012-06-20 00:51:14]

On 2012/06/19 21:14:22, Nico wrote:
> fyi, avi's landing a rebased version of this

Closed because my version landed as r143074.