Prefix string16 with base:: in ui/.

ui/base/l10n/l10n_util_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Foundation/Foundation.h>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 35 matching lines @@
   // in all cases on all platforms.  (l10n_util maps en to en-US if it gets
   // passed this on the command line)
   if (locale_value == "en")
     locale_value = "en-US";
 
   g_overridden_locale.Get() = locale_value;
 }
 
 // Remove the Windows-style accelerator marker and change "..." into an
 // ellipsis.  Returns the result in an autoreleased NSString.
-NSString* FixUpWindowsStyleLabel(const string16& label) {
+NSString* FixUpWindowsStyleLabel(const base::string16& label) {
   const char16 kEllipsisUTF16 = 0x2026;
-  string16 ret;
+  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];
     if (c == '(' && i + 3 < label_len && label[i + 1] == '&'
         && label[i + 3] == ')') {
       // Strip '(&?)' patterns which means Windows-style accelerator in some
       // non-English locales such as Japanese.
       i += 3;
     } else if (c == '&') {
@@ skipping 11 matching lines @@
   }
 
   return base::SysUTF16ToNSString(ret);
 }
 
 NSString* GetNSString(int message_id) {
   return base::SysUTF16ToNSString(l10n_util::GetStringUTF16(message_id));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a) {
+                       const base::string16& a) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b) {
+                       const base::string16& a,
+                       const base::string16& b) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
-                       const string16& c) {
+                       const base::string16& a,
+                       const base::string16& b,
+                       const base::string16& c) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, c));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
-                       const string16& c,
-                       const string16& d) {
+                       const base::string16& a,
+                       const base::string16& b,
+                       const base::string16& c,
+                       const base::string16& d) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, c, d));
 }
 
 NSString* GetNSStringF(int message_id,
-                       const string16& a,
-                       const string16& b,
+                       const base::string16& a,
+                       const base::string16& b,
                        std::vector<size_t>* offsets) {
   return base::SysUTF16ToNSString(l10n_util::GetStringFUTF16(message_id,
                                                              a, b, offsets));
 }
 
 NSString* GetNSStringWithFixup(int message_id) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringUTF16(message_id));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a) {
+                                const base::string16& a) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b) {
+                                const base::string16& a,
+                                const base::string16& b) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b,
-                                const string16& c) {
+                                const base::string16& a,
+                                const base::string16& b,
+                                const base::string16& c) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b, c));
 }
 
 NSString* GetNSStringFWithFixup(int message_id,
-                                const string16& a,
-                                const string16& b,
-                                const string16& c,
-                                const string16& d) {
+                                const base::string16& a,
+                                const base::string16& b,
+                                const base::string16& c,
+                                const base::string16& d) {
   return FixUpWindowsStyleLabel(l10n_util::GetStringFUTF16(message_id,
                                                            a, b, c, d));
 }
 
 
 }  // namespace l10n_util