Allow empty strings to be written to the clipboard

content/browser/web_contents/web_drag_source_gtk.cc

 // Copyright (c) 2012 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 "content/browser/web_contents/web_drag_source_gtk.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/nix/mime_util_xdg.h"
@@ skipping 67 matching lines @@
                                      const gfx::Point& image_offset) {
   // Guard against re-starting before previous drag completed.
   if (drag_context_) {
     NOTREACHED();
     web_contents_->SystemDragEnded();
     return;
   }
 
   int targets_mask = 0;
 
-  if (!drop_data.plain_text.empty())
+  if (!drop_data.text.string().empty())
     targets_mask |= ui::TEXT_PLAIN;
   if (drop_data.url.is_valid()) {
     targets_mask |= ui::TEXT_URI_LIST;
     targets_mask |= ui::CHROME_NAMED_URL;
     targets_mask |= ui::NETSCAPE_URL;
   }
-  if (!drop_data.text_html.empty())
+  if (!drop_data.html.string().empty())
     targets_mask |= ui::TEXT_HTML;
   if (!drop_data.file_contents.empty())
     targets_mask |= ui::CHROME_WEBDROP_FILE_CONTENTS;
   if (!drop_data.download_metadata.empty() &&
       drag_download_util::ParseDownloadMetadata(drop_data.download_metadata,
                                                 &wide_download_mime_type_,
                                                 &download_file_name_,
                                                 &download_url_)) {
     targets_mask |= ui::DIRECT_SAVE_FILE;
   }
@@ skipping 70 matching lines @@
 
 void WebDragSourceGtk::OnDragDataGet(GtkWidget* sender,
                                      GdkDragContext* context,
                                      GtkSelectionData* selection_data,
                                      guint target_type,
                                      guint time) {
   const int kBitsPerByte = 8;
 
   switch (target_type) {
     case ui::TEXT_PLAIN: {
-      std::string utf8_text = UTF16ToUTF8(drop_data_->plain_text);
+      std::string utf8_text = UTF16ToUTF8(drop_data_->text.string());
       gtk_selection_data_set_text(selection_data, utf8_text.c_str(),
                                   utf8_text.length());
       break;
     }
 
     case ui::TEXT_HTML: {
       // TODO(estade): change relative links to be absolute using
       // |html_base_url|.
-      std::string utf8_text = UTF16ToUTF8(drop_data_->text_html);
+      std::string utf8_text = UTF16ToUTF8(drop_data_->html.string());
       gtk_selection_data_set(selection_data,
                              ui::GetAtomForTarget(ui::TEXT_HTML),
                              kBitsPerByte,
                              reinterpret_cast<const guchar*>(utf8_text.c_str()),
                              utf8_text.length());
       break;
     }
 
     case ui::TEXT_URI_LIST:
     case ui::CHROME_NAMED_URL:
@@ skipping 197 matching lines @@
   cairo_clip(cr);
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   gdk_cairo_set_source_pixbuf(cr, drag_pixbuf_, 0, 0);
   cairo_paint(cr);
   cairo_destroy(cr);
 
   return TRUE;
 }
 
 }  // namespace content