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

base/clipboard.h

 // 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.
 
 #ifndef BASE_CLIPBOARD_H_
 #define BASE_CLIPBOARD_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "base/file_path.h"
 #include "base/process.h"
+#include "base/string16.h"
 #include "base/gfx/size.h"
 
 #if defined(OS_MACOSX)
 #if defined(__OBJC__)
 @class NSString;
 #else
 class NSString;
 #endif
 #endif
 
@@ skipping 32 matching lines @@
   // * indicates an optional argument.
   //
   // Key           Arguments    Type
   // -------------------------------------
   // CBF_TEXT      text         char array
   // CBF_HTML      html         char array
   //               url*         char array
   // CBF_BOOKMARK  html         char array
   //               url          char array
   // CBF_LINK      html         char array
-  //               url          char array 
+  //               url          char array
   // CBF_FILES     files        char array representing multiple files.
   //                            Filenames are separated by null characters and
   //                            the final filename is double null terminated.
+  //                            The filenames are encoded in platform-specific
+  //                            encoding.
   // CBF_WEBKIT    none         empty vector
   // CBF_BITMAP    pixels       byte array
   //               size         gfx::Size struct
   // CBF_SMBITMAP  shared_mem   shared memory handle
   //               size         gfx::Size struct
   typedef std::vector<char> ObjectMapParam;
   typedef std::vector<ObjectMapParam> ObjectMapParams;
   typedef std::map<int /* ObjectType */, ObjectMapParams> ObjectMap;
 
   Clipboard();
   ~Clipboard();
 
   // Write a bunch of objects to the system clipboard. Copies are made of the
   // contents of |objects|. On Windows they are copied to the system clipboard.
   // On linux they are copied into a structure owned by the Clipboard object and
   // kept until the system clipboard is set again.
   void WriteObjects(const ObjectMap& objects);
 
   // Behaves as above. If there is some shared memory handle passed as one of
   // the objects, it came from the process designated by |process|. This will
   // assist in turning it into a shared memory region that the current process
   // can use.
   void WriteObjects(const ObjectMap& objects, base::ProcessHandle process);
 
   // Tests whether the clipboard contains a certain format
   bool IsFormatAvailable(FormatType format) const;
 
   // Reads UNICODE text from the clipboard, if available.
-  void ReadText(std::wstring* result) const;
+  void ReadText(string16* result) const;
 
   // Reads ASCII text from the clipboard, if available.
   void ReadAsciiText(std::string* result) const;
 
   // Reads HTML from the clipboard, if available.
-  void ReadHTML(std::wstring* markup, std::string* src_url) const;
+  void ReadHTML(string16* markup, std::string* src_url) const;
 
   // Reads a bookmark from the clipboard, if available.
-  void ReadBookmark(std::wstring* title, std::string* url) const;
+  void ReadBookmark(string16* title, std::string* url) const;
 
   // Reads a file or group of files from the clipboard, if available, into the
   // out parameter.
-  void ReadFile(std::wstring* file) const;
-  void ReadFiles(std::vector<std::wstring>* files) const;
+  void ReadFile(FilePath* file) const;
+  void ReadFiles(std::vector<FilePath>* files) const;
 
   // Get format Identifiers for various types.
   static FormatType GetUrlFormatType();
   static FormatType GetUrlWFormatType();
   static FormatType GetMozUrlFormatType();
   static FormatType GetPlainTextFormatType();
   static FormatType GetPlainTextWFormatType();
   static FormatType GetFilenameFormatType();
   static FormatType GetFilenameWFormatType();
   static FormatType GetWebKitSmartPasteFormatType();
@@ skipping 42 matching lines @@
   void WriteBitmapFromSharedMemory(const char* bitmap_data,
                                    const char* size_data,
                                    base::ProcessHandle handle);
 
   void WriteBitmapFromHandle(HBITMAP source_hbitmap,
                              const gfx::Size& size);
 
   // Safely write to system clipboard. Free |handle| on failure.
   void WriteToClipboard(FormatType format, HANDLE handle);
 
-  static void ParseBookmarkClipboardFormat(const std::wstring& bookmark,
-                                           std::wstring* title,
+  static void ParseBookmarkClipboardFormat(const string16& bookmark,
+                                           string16* title,
                                            std::string* url);
 
   // Free a handle depending on its type (as intuited from format)
   static void FreeData(FormatType format, HANDLE data);
 
   // Return the window that should be the clipboard owner, creating it
   // if neccessary.  Marked const for lazily initialization by const methods.
   HWND GetClipboardWindow() const;
 
   // Mark this as mutable so const methods can still do lazy initialization.
@@ skipping 17 matching lines @@
   void InsertMapping(const char* key, char* data, size_t data_len);
 
   TargetMap* clipboard_data_;
   GtkClipboard* clipboard_;
 #endif
 
   DISALLOW_EVIL_CONSTRUCTORS(Clipboard);
 };
 
 #endif  // BASE_CLIPBOARD_H_