Unescape ampersands in network names on network selection screen

Unescape ampersands in network names on network selection screen

MenuModel escapes all ampersands in menu item labels but on network selection
screen this name used not as real menu item so we need to unescape it back.

BUG=480457
TEST=manual

Committed: https://crrev.com/c220144d2ef8c434ec0adf7a1bdce44ba71f2ed9
Cr-Commit-Position: refs/heads/master@{#327280}

[Dmitry Polukhin, 2015-04-28 10:39:32]

dpolukhin@chromium.org changed reviewers:
+ nkostylev@chromium.org

[Dmitry Polukhin, 2015-04-28 10:39:33]

PTAL

[Nikita (slow), 2015-04-28 11:58:51]

lgtm

https://codereview.chromium.org/1107343002/diff/1/chrome/browser/ui/webui/chr...
File chrome/browser/ui/webui/chromeos/login/network_dropdown.cc (right):

https://codereview.chromium.org/1107343002/diff/1/chrome/browser/ui/webui/chr...
chrome/browser/ui/webui/chromeos/login/network_dropdown.cc:100:
item->SetString("label", UnescapeAmpersands(model->GetLabelAt(i)));
Are these escaped while being part of MenuModel?

https://codereview.chromium.org/1107343002/diff/1/chrome/browser/ui/webui/chr...
chrome/browser/ui/webui/chromeos/login/network_dropdown.cc:100:
item->SetString("label", UnescapeAmpersands(model->GetLabelAt(i)));
ReplaceSubstringsAfterOffset(&string, 0, "&&", "&");

[Dmitry Polukhin, 2015-04-28 13:23:10]

https://codereview.chromium.org/1107343002/diff/1/chrome/browser/ui/webui/chr...
File chrome/browser/ui/webui/chromeos/login/network_dropdown.cc (right):

https://codereview.chromium.org/1107343002/diff/1/chrome/browser/ui/webui/chr...
chrome/browser/ui/webui/chromeos/login/network_dropdown.cc:100:
item->SetString("label", UnescapeAmpersands(model->GetLabelAt(i)));
On 2015/04/28 11:58:51, Nikita Kostylev wrote:
> ReplaceSubstringsAfterOffset(&string, 0, "&&", "&");

Done. Yes this escaping is required for real MenuModel use case.

[Dmitry Polukhin, 2015-04-28 13:23:30]

The CQ bit was checked by dpolukhin@chromium.org

[Dmitry Polukhin, 2015-04-28 13:23:31]

The patchset sent to the CQ was uploaded after l-g-t-m from
nkostylev@chromium.org
Link to the patchset: https://codereview.chromium.org/1107343002/#ps20001
(title: "comment resolved")

[commit-bot: I haz the power, 2015-04-28 13:23:34]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1107343002/20001

[commit-bot: I haz the power, 2015-04-28 13:49:06]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-04-28 13:50:13]

Patchset 2 (id:??) landed as
https://crrev.com/c220144d2ef8c434ec0adf7a1bdce44ba71f2ed9
Cr-Commit-Position: refs/heads/master@{#327280}