Move more uses of string16 to specify base::

ui/base/clipboard/scoped_clipboard_writer.cc

 // 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.
 
 // This file implements the ScopedClipboardWriter class. Documentation on its
 // purpose can be found in our header. Documentation on the format of the
 // parameters for each clipboard target can be found in clipboard.h.
 
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "ui/gfx/size.h"
 
 namespace ui {
 
 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard,
                                              ClipboardType type)
     : clipboard_(clipboard),
       type_(type) {
 }
 
 ScopedClipboardWriter::~ScopedClipboardWriter() {
   if (!objects_.empty() && clipboard_)
     clipboard_->WriteObjects(type_, objects_);
 }
 
-void ScopedClipboardWriter::WriteText(const string16& text) {
+void ScopedClipboardWriter::WriteText(const base::string16& text) {
   WriteTextOrURL(text, false);
 }
 
-void ScopedClipboardWriter::WriteURL(const string16& text) {
+void ScopedClipboardWriter::WriteURL(const base::string16& text) {
   WriteTextOrURL(text, true);
 }
 
-void ScopedClipboardWriter::WriteHTML(const string16& markup,
+void ScopedClipboardWriter::WriteHTML(const base::string16& markup,
                                       const std::string& source_url) {
   std::string utf8_markup = UTF16ToUTF8(markup);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(
       Clipboard::ObjectMapParam(utf8_markup.begin(),
                                 utf8_markup.end()));
   if (!source_url.empty()) {
     parameters.push_back(Clipboard::ObjectMapParam(source_url.begin(),
                                                    source_url.end()));
   }
 
   objects_[Clipboard::CBF_HTML] = parameters;
 }
 
 void ScopedClipboardWriter::WriteRTF(const std::string& rtf_data) {
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(rtf_data.begin(),
                                                  rtf_data.end()));
   objects_[Clipboard::CBF_RTF] = parameters;
 }
 
-void ScopedClipboardWriter::WriteBookmark(const string16& bookmark_title,
+void ScopedClipboardWriter::WriteBookmark(const base::string16& bookmark_title,
                                           const std::string& url) {
   if (bookmark_title.empty() || url.empty())
     return;
 
   std::string utf8_markup = UTF16ToUTF8(bookmark_title);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(utf8_markup.begin(),
                                                  utf8_markup.end()));
   parameters.push_back(Clipboard::ObjectMapParam(url.begin(), url.end()));
   objects_[Clipboard::CBF_BOOKMARK] = parameters;
 }
 
-void ScopedClipboardWriter::WriteHyperlink(const string16& anchor_text,
+void ScopedClipboardWriter::WriteHyperlink(const base::string16& anchor_text,
                                            const std::string& url) {
   if (anchor_text.empty() || url.empty())
     return;
 
   // Construct the hyperlink.
   std::string html("<a href=\"");
   html.append(net::EscapeForHTML(url));
   html.append("\">");
   html.append(net::EscapeForHTML(UTF16ToUTF8(anchor_text)));
   html.append("</a>");
@@ skipping 19 matching lines @@
   parameters.push_back(format_parameter);
   parameters.push_back(data_parameter);
   objects_[Clipboard::CBF_DATA] = parameters;
 }
 
 void ScopedClipboardWriter::Reset() {
   url_text_.clear();
   objects_.clear();
 }
 
-void ScopedClipboardWriter::WriteTextOrURL(const string16& text, bool is_url) {
+void ScopedClipboardWriter::WriteTextOrURL(const base::string16& text,
+                                           bool is_url) {
   std::string utf8_text = UTF16ToUTF8(text);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(utf8_text.begin(),
                                                  utf8_text.end()));
   objects_[Clipboard::CBF_TEXT] = parameters;
 
   if (is_url) {
     url_text_ = utf8_text;
   } else {
     url_text_.clear();
   }
 }
 
 }  // namespace ui