Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: ui/base/l10n/l10n_util_mac.mm

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/win/tsf_text_store_unittest.cc ('k') | ui/base/l10n/l10n_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ui/base/ime/win/tsf_text_store_unittest.cc ('k') | ui/base/l10n/l10n_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698