Remove guest icon and update screen text according to new approved UI.

Remove guest icon and update screen text according to new approved UI.

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

[bcwhite, 2013-09-04 17:15:49]

use conditions in resources instead of code

[bcwhite, 2013-09-04 17:19:53]

restore original android page content

[bcwhite, 2013-09-05 15:32:56]

Evan, this is new CL that does the same as the previous one you reviewed but as
a condition in the generated-resources rather than in the code.  Old CL was
deleted before being submitted.

[Evan Stade, 2013-09-05 17:08:30]

cool

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
chrome/app/generated_resources.grd:10712: +        <if expr="not
pp_ifdef('chromeos')">
can you narrow the cope of the if expr to only the part that actually differs

[Evan Stade, 2013-09-05 17:09:29]

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
chrome/app/generated_resources.grd:10712: +        <if expr="not
pp_ifdef('chromeos')">
On 2013/09/05 17:08:30, Evan Stade wrote:
> can you narrow the cope of the if expr to only the part that actually differs

(I'm not actually sure if that's possible)

[bcwhite, 2013-09-05 20:07:00]

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/23587012/diff/1005/chrome/app/generated_resou...
chrome/app/generated_resources.grd:10712: +        <if expr="not
pp_ifdef('chromeos')">
> can you narrow the cope of the if expr to only the part that actually differs

Hmmm...  I'll give it a try, but I'm not sure if that wouldn't just cause
potential issues down the road as the separate projects updated their skins.

[bcwhite, 2013-09-05 20:17:08]

It looks to me like it'll likely mess up the strings as they're passed off to
the translation team if I try to merge them like that.

[Evan Stade, 2013-09-05 22:46:30]

lgtm

[commit-bot: I haz the power, 2013-09-06 13:20:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/bcwhite@chromium.org/23587012/1005

[commit-bot: I haz the power, 2013-09-06 17:11:36]

Change committed as 221720