Prefix string16 with base:: in ui/.

ui/base/x/selection_utils.cc

 // 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.
 
 #include "ui/base/x/selection_utils.h"
 
 #include <set>
 
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
@@ skipping 37 matching lines @@
                          std::vector< ::Atom>* output) {
   for (std::vector< ::Atom>::const_iterator it = desired.begin();
        it != desired.end(); ++it) {
     std::vector< ::Atom>::const_iterator jt =
       std::find(offered.begin(), offered.end(), *it);
     if (jt != offered.end())
       output->push_back(*it);
   }
 }
 
-void AddString16ToVector(const string16& str,
+void AddString16ToVector(const base::string16& str,
                          std::vector<unsigned char>* bytes) {
   const unsigned char* front =
       reinterpret_cast<const unsigned char*>(str.data());
   bytes->insert(bytes->end(), front, front + (str.size() * 2));
 }
 
 std::string RefCountedMemoryToString(
     const scoped_refptr<base::RefCountedMemory>& memory) {
   if (!memory.get()) {
     NOTREACHED();
     return std::string();
   }
 
   size_t size = memory->size();
   if (!size)
     return std::string();
 
   const unsigned char* front = memory->front();
   return std::string(reinterpret_cast<const char*>(front), size);
 }
 
-string16 RefCountedMemoryToString16(
+base::string16 RefCountedMemoryToString16(
     const scoped_refptr<base::RefCountedMemory>& memory) {
   if (!memory.get()) {
     NOTREACHED();
-    return string16();
+    return base::string16();
   }
 
   size_t size = memory->size();
   if (!size)
-    return string16();
+    return base::string16();
 
   const unsigned char* front = memory->front();
-  return string16(reinterpret_cast<const base::char16*>(front), size / 2);
+  return base::string16(reinterpret_cast<const base::char16*>(front), size / 2);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SelectionFormatMap::SelectionFormatMap() {}
 
 SelectionFormatMap::~SelectionFormatMap() {}
 
 void SelectionFormatMap::Insert(
     ::Atom atom,
@@ skipping 81 matching lines @@
                                     &result);
     return result;
   } else {
     // BTW, I looked at COMPOUND_TEXT, and there's no way we're going to
     // support that. Yuck.
     NOTREACHED();
     return std::string();
   }
 }
 
-string16 SelectionData::GetHtml() const {
-  string16 markup;
+base::string16 SelectionData::GetHtml() const {
+  base::string16 markup;
 
   if (type_ == atom_cache_.GetAtom(Clipboard::kMimeTypeHTML)) {
     const unsigned char* data = GetData();
     size_t size = GetSize();
 
     // If the data starts with 0xFEFF, i.e., Byte Order Mark, assume it is
     // UTF-16, otherwise assume UTF-8.
     if (size >= 2 &&
         reinterpret_cast<const uint16_t*>(data)[0] == 0xFEFF) {
       markup.assign(reinterpret_cast<const uint16_t*>(data) + 1,
@@ skipping 10 matching lines @@
   } else {
     NOTREACHED();
     return markup;
   }
 }
 
 void SelectionData::AssignTo(std::string* result) const {
   *result = RefCountedMemoryToString(memory_);
 }
 
-void SelectionData::AssignTo(string16* result) const {
+void SelectionData::AssignTo(base::string16* result) const {
   *result = RefCountedMemoryToString16(memory_);
 }
 
 }  // namespace ui