Remove cf_html from webdropdata.h. This is windows

chrome/common/os_exchange_data.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 <shlobj.h>
 
 #include "chrome/common/os_exchange_data.h"
 
 #include "base/clipboard_util.h"
 #include "base/file_util.h"
@@ skipping 317 matching lines @@
   STGMEDIUM* storage = GetStorageForFileDescriptor(filename);
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetFileDescriptorFormat()->cfFormat, storage));
 
   // Add CFSTR_FILECONTENTS
   storage = GetStorageForBytes(file_contents.data(), file_contents.length());
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetFileContentFormatZero()->cfFormat, storage));
 }
 
-void OSExchangeData::SetCFHtml(const std::wstring& cf_html) {
-  std::string utf8 = WideToUTF8(cf_html);
-  STGMEDIUM* storage = GetStorageForBytes(utf8.c_str(), utf8.size());
+void OSExchangeData::SetHtml(const std::wstring& html, const GURL& base_url) {
+  // Add both MS CF_HTML and text/html format.  CF_HTML should be in utf-8.
+  std::string utf8_html = WideToUTF8(html);
+  std::string url = base_url.is_valid() ? base_url.spec() : std::string();
+
+  std::string cf_html = ClipboardUtil::HtmlToCFHtml(utf8_html, url);
+  STGMEDIUM* storage = GetStorageForBytes(cf_html.c_str(), cf_html.size());
   contents_.push_back(new StoredDataInfo(
       ClipboardUtil::GetHtmlFormat()->cfFormat, storage));
+
+  STGMEDIUM* storage_plain = GetStorageForBytes(utf8_html.c_str(),
+                                                utf8_html.size());
+  contents_.push_back(new StoredDataInfo(
+      ClipboardUtil::GetTextHtmlFormat()->cfFormat, storage_plain));
 }
 
 bool OSExchangeData::GetString(std::wstring* data) const {
   return ClipboardUtil::GetPlainText(source_object_, data);
 }
 
 bool OSExchangeData::GetURLAndTitle(GURL* url, std::wstring* title) const {
   std::wstring url_str;
   bool success = ClipboardUtil::GetUrl(source_object_, &url_str, title);
   if (success) {
@@ skipping 35 matching lines @@
   }
   return success;
 }
 
 bool OSExchangeData::GetFileContents(std::wstring* filename,
                                      std::string* file_contents) const {
   return ClipboardUtil::GetFileContents(source_object_, filename,
                                         file_contents);
 }
 
-bool OSExchangeData::GetCFHtml(std::wstring* cf_html) const {
-  return ClipboardUtil::GetCFHtml(source_object_, cf_html);
+bool OSExchangeData::GetHtml(std::wstring* html, GURL* base_url) const {
+  std::string url;
+  bool success = ClipboardUtil::GetHtml(source_object_, html, &url);
+  if (success)
+    *base_url = GURL(url);
+  return success;
 }
 
 bool OSExchangeData::HasString() const {
   return ClipboardUtil::HasPlainText(source_object_);
 }
 
 bool OSExchangeData::HasURL() const {
   return (ClipboardUtil::HasUrl(source_object_) ||
           HasPlainTextURL(source_object_));
 }
@@ skipping 276 matching lines @@
 
   GlobalUnlock(handle);
 
   STGMEDIUM* storage = new STGMEDIUM;
   storage->hGlobal = handle;
   storage->tymed = TYMED_HGLOBAL;
   storage->pUnkForRelease = NULL;
   return storage;
 }