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

base/clipboard_win.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.
 
 // Many of these functions are based on those found in
 // webkit/port/platform/PasteboardWin.cpp
 
 #include "base/clipboard.h"
 
 #include <shlobj.h>
 #include <shellapi.h>
 
 #include "base/clipboard_util.h"
+#include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 
 namespace {
 
 // A scoper to manage acquiring and automatically releasing the clipboard.
 class ScopedClipboard {
  public:
@@ skipping 138 matching lines @@
     if (iter->first == CBF_SMBITMAP)
       WriteBitmapFromSharedMemory(&(iter->second[0].front()),
                                   &(iter->second[1].front()),
                                   process);
     else
       DispatchObject(static_cast<ObjectType>(iter->first), iter->second);
   }
 }
 
 void Clipboard::WriteText(const char* text_data, size_t text_len) {
-  std::wstring text;
-  UTF8ToWide(text_data, text_len, &text);
+  string16 text;
+  UTF8ToUTF16(text_data, text_len, &text);
   HGLOBAL glob = CreateGlobalData(text);
 
   WriteToClipboard(CF_UNICODETEXT, glob);
 }
 
 void Clipboard::WriteHTML(const char* markup_data,
                           size_t markup_len,
                           const char* url_data,
                           size_t url_len) {
   std::string markup(markup_data, markup_len);
   std::string url;
 
   if (url_len > 0)
     url.assign(url_data, url_len);
 
   std::string html_fragment = ClipboardUtil::HtmlToCFHtml(markup, url);
   HGLOBAL glob = CreateGlobalData(html_fragment);
 
   WriteToClipboard(GetHtmlFormatType(), glob);
 }
 
 void Clipboard::WriteBookmark(const char* title_data,
                               size_t title_len,
                               const char* url_data,
                               size_t url_len) {
   std::string bookmark(title_data, title_len);
   bookmark.append(1, L'\n');
   bookmark.append(url_data, url_len);
 
-  std::wstring wide_bookmark = UTF8ToWide(bookmark);
+  string16 wide_bookmark = UTF8ToWide(bookmark);
   HGLOBAL glob = CreateGlobalData(wide_bookmark);
 
   WriteToClipboard(GetUrlWFormatType(), glob);
 }
 
 void Clipboard::WriteHyperlink(const char* title_data,
                                size_t title_len,
                                const char* url_data,
                                size_t url_len) {
   // Store as a bookmark.
@@ skipping 129 matching lines @@
   ::DeleteDC(source_dc);
   ::ReleaseDC(NULL, dc);
 
   WriteToClipboard(CF_BITMAP, hbitmap);
 }
 
 // Write a file or set of files to the clipboard in HDROP format. When the user
 // invokes a paste command (in a Windows explorer shell, for example), the files
 // will be copied to the paste location.
 void Clipboard::WriteFiles(const char* file_data, size_t file_len) {
-  std::wstring filenames(UTF8ToWide(std::string(file_data, file_len)));
   // Calculate the amount of space we'll need store the strings and
   // a DROPFILES struct.
-  size_t bytes = sizeof(DROPFILES) + filenames.length() * sizeof(wchar_t);
+  size_t bytes = sizeof(DROPFILES) + file_len;
 
   HANDLE hdata = ::GlobalAlloc(GMEM_MOVEABLE, bytes);
   if (!hdata)
     return;
 
   char* data = static_cast<char*>(::GlobalLock(hdata));
   DROPFILES* drop_files = reinterpret_cast<DROPFILES*>(data);
   drop_files->pFiles = sizeof(DROPFILES);
   drop_files->fWide = TRUE;
 
-  memcpy(data + sizeof DROPFILES, filenames.c_str(),
-         filenames.length() * sizeof(wchar_t));
+  memcpy(data + sizeof(DROPFILES), file_data, file_len);
 
   ::GlobalUnlock(hdata);
   WriteToClipboard(CF_HDROP, hdata);
 }
 
 void Clipboard::WriteToClipboard(FormatType format, HANDLE handle) {
   DCHECK(clipboard_owner_);
   if (handle && !::SetClipboardData(format, handle)) {
     DCHECK(ERROR_CLIPBOARD_NOT_OPEN != GetLastError());
     FreeData(format, handle);
   }
 }
 
 bool Clipboard::IsFormatAvailable(unsigned int format) const {
   return ::IsClipboardFormatAvailable(format) != FALSE;
 }
 
-void Clipboard::ReadText(std::wstring* result) const {
+void Clipboard::ReadText(string16* result) const {
   if (!result) {
     NOTREACHED();
     return;
   }
 
   result->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
   HANDLE data = ::GetClipboardData(CF_UNICODETEXT);
   if (!data)
     return;
 
-  result->assign(static_cast<const wchar_t*>(::GlobalLock(data)));
+  result->assign(static_cast<const char16*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 }
 
 void Clipboard::ReadAsciiText(std::string* result) const {
   if (!result) {
     NOTREACHED();
     return;
   }
 
   result->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
   HANDLE data = ::GetClipboardData(CF_TEXT);
   if (!data)
     return;
 
   result->assign(static_cast<const char*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 }
 
-void Clipboard::ReadHTML(std::wstring* markup, std::string* src_url) const {
+void Clipboard::ReadHTML(string16* markup, std::string* src_url) const {
   if (markup)
     markup->clear();
 
   if (src_url)
     src_url->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
   HANDLE data = ::GetClipboardData(GetHtmlFormatType());
   if (!data)
     return;
 
   std::string html_fragment(static_cast<const char*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 
   std::string markup_utf8;
   ClipboardUtil::CFHtmlToHtml(html_fragment, &markup_utf8, src_url);
   markup->assign(UTF8ToWide(markup_utf8));
 }
 
-void Clipboard::ReadBookmark(std::wstring* title, std::string* url) const {
+void Clipboard::ReadBookmark(string16* title, std::string* url) const {
   if (title)
     title->clear();
 
   if (url)
     url->clear();
 
   // Acquire the clipboard.
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
   HANDLE data = ::GetClipboardData(GetUrlWFormatType());
   if (!data)
     return;
 
-  std::wstring bookmark(static_cast<const wchar_t*>(::GlobalLock(data)));
+  string16 bookmark(static_cast<const char16*>(::GlobalLock(data)));
   ::GlobalUnlock(data);
 
   ParseBookmarkClipboardFormat(bookmark, title, url);
 }
 
 // Read a file in HDROP format from the clipboard.
-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<FilePath> files;
   ReadFiles(&files);
 
   // Take the first file, if available.
   if (!files.empty())
     file->assign(files[0]);
 }
 
 // Read a set of files in HDROP format from the clipboard.
-void Clipboard::ReadFiles(std::vector<std::wstring>* files) const {
+void Clipboard::ReadFiles(std::vector<FilePath>* files) const {
   if (!files) {
     NOTREACHED();
     return;
   }
 
   files->clear();
 
   ScopedClipboard clipboard;
   if (!clipboard.Acquire(GetClipboardWindow()))
     return;
 
   HDROP drop = static_cast<HDROP>(::GetClipboardData(CF_HDROP));
   if (!drop)
     return;
 
   // Count of files in the HDROP.
   int count = ::DragQueryFile(drop, 0xffffffff, NULL, 0);
 
   if (count) {
     for (int i = 0; i < count; ++i) {
       int size = ::DragQueryFile(drop, i, NULL, 0) + 1;
-      std::wstring file;
+      string16 file;
       ::DragQueryFile(drop, i, WriteInto(&file, size), size);
       files->push_back(file);
     }
   }
 }
 
 // static
-void Clipboard::ParseBookmarkClipboardFormat(const std::wstring& bookmark,
-                                             std::wstring* title,
-                                             std::string* url) {
-  const wchar_t* const kDelim = L"\r\n";
+void Clipboard::ParseBookmarkClipboardFormat(const string16& bookmark,
+                                             string16* title,
+                                             string16* url) {
+  const string16 kDelim = ASCIIToUTF16("\r\n");
 
   const size_t title_end = bookmark.find_first_of(kDelim);
   if (title)
     title->assign(bookmark.substr(0, title_end));
 
   if (url) {
     const size_t url_start = bookmark.find_first_not_of(kDelim, title_end);
-    if (url_start != std::wstring::npos)
-      *url = WideToUTF8(bookmark.substr(url_start, std::wstring::npos));
+    if (url_start != string16::npos)
+      *url = UTF16ToUTF8(bookmark.substr(url_start, string16::npos));
   }
 }
 
 // static
 Clipboard::FormatType Clipboard::GetUrlFormatType() {
   return ClipboardUtil::GetUrlFormat()->cfFormat;
 }
 
 // static
 Clipboard::FormatType Clipboard::GetUrlWFormatType() {
@@ skipping 97 matching lines @@
 HWND Clipboard::GetClipboardWindow() const {
   if (!clipboard_owner_ && create_window_) {
     clipboard_owner_ = ::CreateWindow(L"ClipboardOwnerWindowClass",
                                       L"ClipboardOwnerWindow",
                                       0, 0, 0, 0, 0,
                                       HWND_MESSAGE,
                                       0, 0, 0);
   }
   return clipboard_owner_;
 }