Modified clipboard classes to use string16 instead of std::wstring

base/clipboard_linux.cc

 // Copyright (c) 2006-2008 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 "base/clipboard.h"
 #include "base/string_util.h"
 
 #include <gtk/gtk.h>
 #include <map>
 #include <set>
@@ skipping 182 matching lines @@
       break;
     }
   }
 
   gtk_selection_data_free(data);
   g_free(targets);
 
   return retval;
 }
 
-void Clipboard::ReadText(std::wstring* result) const {
+void Clipboard::ReadText(string16* result) const {
   result->clear();
   gchar* text = gtk_clipboard_wait_for_text(clipboard_);
 
   if (text == NULL)
    return;
 
   // TODO(estade): do we want to handle the possible error here?
-  UTF8ToWide(text, strlen(text), result);
+  UTF8ToUTF16(text, strlen(text), result);
   g_free(text);
 }
 
 void Clipboard::ReadAsciiText(std::string* result) const {
   result->clear();
   gchar* text = gtk_clipboard_wait_for_text(clipboard_);
 
   if (text == NULL)
    return;
 
   result->assign(text);
   g_free(text);
 }
 
+void Clipboard::ReadFile(FilePath* file) const {
+  file->clear();
+}
+
 // TODO(estade): handle different charsets.
-void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const {
+void Clipboard::ReadHTML(string16* markup, std::string* src_url) const {
   markup->clear();
 
   GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard_,
                                                            GetHtmlFormatType());
 
   if (!data)
     return;
 
-  UTF8ToWide(reinterpret_cast<char*>(data->data),
-             strlen(reinterpret_cast<char*>(data->data)),
-             markup);
+  UTF8ToUTF16(reinterpret_cast<char*>(data->data),
+              strlen(reinterpret_cast<char*>(data->data)),
+              markup);
   gtk_selection_data_free(data);
 }
 
 // static
 Clipboard::FormatType Clipboard::GetPlainTextFormatType() {
   return GDK_TARGET_STRING;
 }
 
 // static
 Clipboard::FormatType Clipboard::GetPlainTextWFormatType() {
@@ skipping 18 matching lines @@
 void Clipboard::InsertMapping(const char* key,
                               char* data,
                               size_t data_len) {
   TargetMap::iterator iter = clipboard_data_->find(key);
 
   if (iter != clipboard_data_->end())
     delete[] iter->second.first;
 
   (*clipboard_data_)[key] = std::make_pair(data, data_len);
 }