| Index: ui/base/l10n/l10n_util_mac.mm
|
| diff --git a/ui/base/l10n/l10n_util_mac.mm b/ui/base/l10n/l10n_util_mac.mm
|
| index b2e3cf852047476f3b023cbe5b6ecd7f6c6568f7..8d6ca70307373c8c46bbe2d44e47dc59b6480450 100644
|
| --- a/ui/base/l10n/l10n_util_mac.mm
|
| +++ b/ui/base/l10n/l10n_util_mac.mm
|
| @@ -54,12 +54,12 @@ void OverrideLocaleWithCocoaLocale() {
|
| // Remove the Windows-style accelerator marker and change "..." into an
|
| // ellipsis. Returns the result in an autoreleased NSString.
|
| NSString* FixUpWindowsStyleLabel(const base::string16& label) {
|
| - const char16 kEllipsisUTF16 = 0x2026;
|
| + const base::char16 kEllipsisUTF16 = 0x2026;
|
| base::string16 ret;
|
| size_t label_len = label.length();
|
| ret.reserve(label_len);
|
| for (size_t i = 0; i < label_len; ++i) {
|
| - char16 c = label[i];
|
| + base::char16 c = label[i];
|
| if (c == '(' && i + 3 < label_len && label[i + 1] == '&'
|
| && label[i + 3] == ')') {
|
| // Strip '(&?)' patterns which means Windows-style accelerator in some
|
|
|