Allow empty strings to be written to the clipboard

content/browser/web_contents/web_contents_view_aura.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_contents_view_aura.h"
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
@@ skipping 76 matching lines @@
 
  private:
   WebContentsImpl* contents_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura);
 };
 
 // Utility to fill a ui::OSExchangeDataProviderAura object from WebDropData.
 void PrepareDragData(const WebDropData& drop_data,
                      ui::OSExchangeDataProviderAura* provider) {
-  if (!drop_data.plain_text.empty())
-    provider->SetString(drop_data.plain_text);
+  if (!drop_data.text.string().empty())
+    provider->SetString(drop_data.text.string());
   if (drop_data.url.is_valid())
     provider->SetURL(drop_data.url, drop_data.url_title);
-  if (!drop_data.text_html.empty())
-    provider->SetHtml(drop_data.text_html, drop_data.html_base_url);
+  if (!drop_data.html.string().empty())
+    provider->SetHtml(drop_data.html.string(), drop_data.html_base_url);
   if (!drop_data.filenames.empty()) {
     std::vector<ui::OSExchangeData::FileInfo> filenames;
     for (std::vector<WebDropData::FileInfo>::const_iterator it =
              drop_data.filenames.begin();
          it != drop_data.filenames.end(); ++it) {
       filenames.push_back(
           ui::OSExchangeData::FileInfo(
               FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->path)),
               FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->display_name))));
     }
     provider->SetFilenames(filenames);
   }
   if (!drop_data.custom_data.empty()) {
     Pickle pickle;
     ui::WriteCustomDataToPickle(drop_data.custom_data, &pickle);
     provider->SetPickledData(ui::Clipboard::GetWebCustomDataFormatType(),
                              pickle);
   }
 }
 
 // Utility to fill a WebDropData object from ui::OSExchangeData.
 void PrepareWebDropData(WebDropData* drop_data,
                         const ui::OSExchangeData& data) {
-  string16 plain_text, url_title;
-  GURL url;
-
+  string16 plain_text;
   data.GetString(&plain_text);
   if (!plain_text.empty())
-    drop_data->plain_text = plain_text;
+    drop_data->text = NullableString16(plain_text, false);
 
+  GURL url;
+  string16 url_title;
   data.GetURLAndTitle(&url, &url_title);
   if (url.is_valid()) {
     drop_data->url = url;
     drop_data->url_title = url_title;
   }
 
-  data.GetHtml(&drop_data->text_html, &drop_data->html_base_url);
+  string16 html;
+  GURL html_base_url;
+  data.GetHtml(&html, &html_base_url);
+  if (!html.empty())
+    drop_data->html = NullableString16(html, false);
+  if (html_base_url.is_valid())
+    drop_data->html_base_url = html_base_url;
 
   std::vector<ui::OSExchangeData::FileInfo> files;
   if (data.GetFilenames(&files) && !files.empty()) {
     for (std::vector<ui::OSExchangeData::FileInfo>::const_iterator
              it = files.begin(); it != files.end(); ++it) {
       drop_data->filenames.push_back(
           WebDropData::FileInfo(
               UTF8ToUTF16(it->path.AsUTF8Unsafe()),
               UTF8ToUTF16(it->display_name.AsUTF8Unsafe())));
     }
@@ skipping 466 matching lines @@
     OnDragEntered(event);
 
   web_contents_->GetRenderViewHost()->DragTargetDrop(
       event.location(),
       GetNativeView()->GetRootWindow()->last_mouse_location(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   return current_drag_op_;
 }