Removing parsing of text from pasteboard.

ui/base/dragdrop/os_exchange_data.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 "ui/base/dragdrop/os_exchange_data.h"
 
 #include "base/pickle.h"
 #include "build/build_config.h"
+#include "net/base/filename_util.h"
 #include "url/gurl.h"
 
 namespace ui {
 
 OSExchangeData::DownloadFileInfo::DownloadFileInfo(
     const base::FilePath& filename,
     DownloadFileProvider* downloader)
     : filename(filename),
       downloader(downloader) {
 }
@@ skipping 36 matching lines @@
 
 void OSExchangeData::SetPickledData(const Clipboard::FormatType& format,
                                     const base::Pickle& data) {
   provider_->SetPickledData(format, data);
 }
 
 bool OSExchangeData::GetString(base::string16* data) const {
   return provider_->GetString(data);
 }
 
-bool OSExchangeData::GetURLAndTitle(FilenameToURLPolicy policy,
+bool OSExchangeData::GetURLAndTitle(FilenameToURLPolicy filename_policy,
+                                    URLTextParsePolicy text_parse_policy,
                                     GURL* url,
                                     base::string16* title) const {
-  return provider_->GetURLAndTitle(policy, url, title);
+  if (provider_->GetURLAndTitle(filename_policy, url, title))
+    return true;
+  if (text_parse_policy == DO_NOT_PARSE_TEXT_AS_URL)
+    return false;
+  base::string16 url_str;
+  if (!provider_->GetString(&url_str))
+    return false;
+  GURL test(url_str);
+  if (!test.is_valid())
+    return false;
+  *url = std::move(test);

[dcheng, 2016/05/28 20:10:03]

FYI: GURL doesn't have a move constructor, so this doesn't actually do anything.

+  *title = net::GetSuggestedFilename(*url, "", "", "", "", std::string());
+  return true;
 }
 
 bool OSExchangeData::GetFilename(base::FilePath* path) const {
   return provider_->GetFilename(path);
 }
 
 bool OSExchangeData::GetFilenames(std::vector<FileInfo>* filenames) const {
   return provider_->GetFilenames(filenames);
 }
 
 bool OSExchangeData::GetPickledData(const Clipboard::FormatType& format,
                                     base::Pickle* data) const {
   return provider_->GetPickledData(format, data);
 }
 
 bool OSExchangeData::HasString() const {
   return provider_->HasString();
 }
 
-bool OSExchangeData::HasURL(FilenameToURLPolicy policy) const {
-  return provider_->HasURL(policy);
+bool OSExchangeData::HasURL(FilenameToURLPolicy filename_policy,
+                            URLTextParsePolicy text_parse_policy) const {
+  if (provider_->HasURL(filename_policy))
+    return true;
+  if (text_parse_policy == DO_NOT_PARSE_TEXT_AS_URL)
+    return false;
+  base::string16 url_str;
+  if (provider_->GetString(&url_str))
+    return false;
+  return GURL(url_str).is_valid();
 }
 
 bool OSExchangeData::HasFile() const {
   return provider_->HasFile();
 }
 
 bool OSExchangeData::HasCustomFormat(
     const Clipboard::FormatType& format) const {
   return provider_->HasCustomFormat(format);
 }
 
 bool OSExchangeData::HasAnyFormat(
     int formats,
     const std::set<Clipboard::FormatType>& format_types) const {
   if ((formats & STRING) != 0 && HasString())
     return true;
-  if ((formats & URL) != 0 && HasURL(CONVERT_FILENAMES))
+  if ((formats & URL) != 0 && HasURL(CONVERT_FILENAMES, PARSE_TEXT_AS_URL))
     return true;
 #if defined(OS_WIN)
   if ((formats & FILE_CONTENTS) != 0 && provider_->HasFileContents())
     return true;
 #endif
 #if defined(USE_AURA)
   if ((formats & HTML) != 0 && provider_->HasHtml())
     return true;
 #endif
   if ((formats & FILE_NAME) != 0 && provider_->HasFile())
@@ skipping 25 matching lines @@
 void OSExchangeData::SetHtml(const base::string16& html, const GURL& base_url) {
   provider_->SetHtml(html, base_url);
 }
 
 bool OSExchangeData::GetHtml(base::string16* html, GURL* base_url) const {
   return provider_->GetHtml(html, base_url);
 }
 #endif
 
 }  // namespace ui