Prefix string16 with base:: in ui/.

ui/base/l10n/l10n_util_collator.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_BASE_L10N_L10N_UTIL_COLLATOR_H_
 #define UI_BASE_L10N_L10N_UTIL_COLLATOR_H_
 
 #include <algorithm>
 #include <functional>
 #include <string>
@@ skipping 64 matching lines @@
     return;
   }
 
   std::sort(elements->begin(), elements->end(),
       StringMethodComparatorWithCollator<T, Method>(collator.get(), method));
 }
 
 // Compares two elements' string keys and returns true if the first element's
 // string key is less than the second element's string key. The Element must
 // have a method like the follow format to return the string key.
-// const string16& GetStringKey() const;
+// const base::string16& GetStringKey() const;
 // This uses the locale specified in the constructor.
 template <class Element>
 class StringComparator : public std::binary_function<const Element&,
                                                      const Element&,
                                                      bool> {
  public:
   explicit StringComparator(icu::Collator* collator)
       : collator_(collator) { }
 
   // Returns true if lhs precedes rhs.
   bool operator()(const Element& lhs, const Element& rhs) {
     const base::string16& lhs_string_key = lhs.GetStringKey();
     const base::string16& rhs_string_key = rhs.GetStringKey();
 
     return StringComparator<base::string16>(collator_)(lhs_string_key,
                                                  rhs_string_key);
   }
 
  private:
   icu::Collator* collator_;
 };
 
-// Specialization of operator() method for string16 version.
+// Specialization of operator() method for base::string16 version.
 template <> UI_EXPORT
 bool StringComparator<base::string16>::operator()(const base::string16& lhs,
                                                   const base::string16& rhs);
 
 // In place sorting of |elements| of a vector according to the string key of
 // each element in the vector by using collation rules for |locale|.
 // |begin_index| points to the start position of elements in the vector which
 // want to be sorted. |end_index| points to the end position of elements in the
 // vector which want to be sorted
 template <class Element>
@@ skipping 23 matching lines @@
 void SortVectorWithStringKey(const std::string& locale,
                              std::vector<Element>* elements,
                              bool needs_stable_sort) {
   SortVectorWithStringKey<Element>(locale, elements, 0, elements->size(),
                                    needs_stable_sort);
 }
 
 }  // namespace l10n_util
 
 #endif  // UI_BASE_L10N_L10N_UTIL_COLLATOR_H_