Prefix string16 with base:: in ui/.

ui/base/x/selection_utils.h

 // Copyright (c) 2013 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_X_SELECTION_UTILS_H_
 #define UI_BASE_X_SELECTION_UTILS_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ skipping 19 matching lines @@
 // Returns a list of all text atoms that we handle.
 UI_EXPORT std::vector< ::Atom> GetTextAtomsFrom(const X11AtomCache* atom_cache);
 
 UI_EXPORT std::vector< ::Atom> GetURLAtomsFrom(const X11AtomCache* atom_cache);
 
 // Places the intersection of |desired| and |offered| into |output|.
 UI_EXPORT void GetAtomIntersection(const std::vector< ::Atom>& desired,
                                    const std::vector< ::Atom>& offered,
                                    std::vector< ::Atom>* output);
 
-// Takes the raw bytes of the string16 and copies them into |bytes|.
-UI_EXPORT void AddString16ToVector(const string16& str,
+// Takes the raw bytes of the base::string16 and copies them into |bytes|.
+UI_EXPORT void AddString16ToVector(const base::string16& str,
                                    std::vector<unsigned char>* bytes);
 
 UI_EXPORT std::string RefCountedMemoryToString(
     const scoped_refptr<base::RefCountedMemory>& memory);
 
-UI_EXPORT string16 RefCountedMemoryToString16(
+UI_EXPORT base::string16 RefCountedMemoryToString16(
     const scoped_refptr<base::RefCountedMemory>& memory);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Represents the selection in different data formats. Binary data passed in is
 // assumed to be allocated with new char[], and is owned by SelectionFormatMap.
 class UI_EXPORT SelectionFormatMap {
  public:
   // Our internal data store, which we only expose through iterators.
   typedef std::map< ::Atom, scoped_refptr<base::RefCountedMemory> > InternalMap;
@@ skipping 40 matching lines @@
   bool IsValid() const;
   ::Atom GetType() const;
   const unsigned char* GetData() const;
   size_t GetSize() const;
 
   // If |type_| is a string type, convert the data to UTF8 and return it.
   std::string GetText() const;
 
   // If |type_| is the HTML type, returns the data as a string16. This detects
   // guesses the character encoding of the source.
-  string16 GetHtml() const;
+  base::string16 GetHtml() const;
 
   // Assigns the raw data to the string.
   void AssignTo(std::string* result) const;
-  void AssignTo(string16* result) const;
+  void AssignTo(base::string16* result) const;
 
  private:
   ::Atom type_;
   scoped_refptr<base::RefCountedMemory> memory_;
 
   X11AtomCache atom_cache_;
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_SELECTION_UTILS_H_