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

base/clipboard_mac.mm

 // 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"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 122 matching lines @@
   [pb setData:nil forType:GetWebKitSmartPasteFormatType()];
 }
 
 bool Clipboard::IsFormatAvailable(NSString* format) const {
   NSPasteboard* pb = GetPasteboard();
   NSArray* types = [pb types];
 
   return [types containsObject:format];
 }
 
-void Clipboard::ReadText(std::wstring* result) const {
+void Clipboard::ReadText(string16* result) const {
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
-  UTF8ToWide([contents UTF8String],
-             [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-             result);
+  UTF8ToUTF16([contents UTF8String],
+              [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
+              result);
 }
 
 void Clipboard::ReadAsciiText(std::string* result) const {
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
   if (!contents)
     result->clear();
   else
     result->assign([contents UTF8String]);
 }
 
-void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const {
+void Clipboard::ReadHTML(string16* markup, std::string* src_url) const {
   if (markup) {
     NSPasteboard* pb = GetPasteboard();
     NSArray *supportedTypes = [NSArray arrayWithObjects:NSHTMLPboardType,
                                                         NSStringPboardType,
                                                         nil];
     NSString *bestType = [pb availableTypeFromArray:supportedTypes];
     NSString* contents = [pb stringForType:bestType];
-    UTF8ToWide([contents UTF8String],
-               [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-               markup);
+    UTF8ToUTF16([contents UTF8String],
+                [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
+                markup);
   }
 
   // TODO(avi): src_url?
   if (src_url)
     src_url->clear();
 }
 
-void Clipboard::ReadBookmark(std::wstring* title, std::string* url) const {
+void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   NSPasteboard* pb = GetPasteboard();
 
   if (title) {
     NSString* contents = [pb stringForType:kUTTypeURLName];
-    UTF8ToWide([contents UTF8String],
-               [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-               title);
+    UTF8ToUTF16([contents UTF8String],
+                [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
+                title);
   }
 
   if (url) {
     NSString* url_string = [[NSURL URLFromPasteboard:pb] absoluteString];
     if (!url_string)
       url->clear();
     else
       url->assign([url_string UTF8String]);
   }
 }
 
-void Clipboard::ReadFile(std::wstring* file) const {
+void Clipboard::ReadFile(FilePath* file) const {
   if (!file) {
     NOTREACHED();
     return;
   }
 
   file->clear();
-  std::vector<std::wstring> files;
+  std::vector<string16> files;
   ReadFiles(&files);
 
   // Take the first file, if available.
   if (!files.empty())
     file->assign(files[0]);
 }
 
-void Clipboard::ReadFiles(std::vector<std::wstring>* files) const {
+void Clipboard::ReadFiles(std::vector<string16>* files) const {
   if (!files) {
     NOTREACHED();
     return;
   }
 
   files->clear();
 
   NSPasteboard* pb = GetPasteboard();
   NSArray* fileList = [pb propertyListForType:NSFilenamesPboardType];
 
   for (unsigned int i = 0; i < [fileList count]; ++i) {
-    std::wstring file = UTF8ToWide([[fileList objectAtIndex:i] UTF8String]);
+    string16 file = UTF8ToUTF16([[fileList objectAtIndex:i] UTF8String]);
     files->push_back(file);
   }
 }
 
 // static
 Clipboard::FormatType Clipboard::GetUrlFormatType() {
   return NSURLPboardType;
 }
 
 // static
@@ skipping 23 matching lines @@
 
 // static
 Clipboard::FormatType Clipboard::GetHtmlFormatType() {
   return NSHTMLPboardType;
 }
 
 // static
 Clipboard::FormatType Clipboard::GetWebKitSmartPasteFormatType() {
   return kWebSmartPastePboardType;
 }