Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(768)

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.cc

Issue 2014733003: Removing parsing of text from pasteboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moving url parsing up the hierarchy Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/dragdrop/os_exchange_data_provider_win.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 47f1e0bb1d283fba3e89f6c7eebf7b3245721157..aebbe9f48fbbdf72d8842808afe954af558ba24d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -221,28 +221,6 @@ FormatEtcEnumerator* FormatEtcEnumerator::CloneFromOther(
// OSExchangeDataProviderWin, public:
// static
-bool OSExchangeDataProviderWin::HasPlainTextURL(IDataObject* source) {
- base::string16 plain_text;
- return (ClipboardUtil::GetPlainText(source, &plain_text) &&
- !plain_text.empty() && GURL(plain_text).is_valid());
-}
-
-// static
-bool OSExchangeDataProviderWin::GetPlainTextURL(IDataObject* source,
- GURL* url) {
- base::string16 plain_text;
- if (ClipboardUtil::GetPlainText(source, &plain_text) &&
- !plain_text.empty()) {
- GURL gurl(plain_text);
- if (gurl.is_valid()) {
- *url = gurl;
- return true;
- }
- }
- return false;
-}
-
-// static
DataObjectImpl* OSExchangeDataProviderWin::GetDataObjectImpl(
const OSExchangeData& data) {
return static_cast<const OSExchangeDataProviderWin*>(&data.provider())->
@@ -411,20 +389,13 @@ bool OSExchangeDataProviderWin::GetURLAndTitle(
OSExchangeData::FilenameToURLPolicy policy,
GURL* url,
base::string16* title) const {
- base::string16 url_str;
- bool success = ClipboardUtil::GetUrl(
- source_object_.get(), url, title,
- policy == OSExchangeData::CONVERT_FILENAMES ? true : false);
- if (success) {
+ if (ClipboardUtil::GetUrl(source_object_.get(), url, title,
+ policy == OSExchangeData::CONVERT_FILENAMES)) {
DCHECK(url->is_valid());
return true;
- } else if (GetPlainTextURL(source_object_.get(), url)) {
- if (url->is_valid())
- *title = net::GetSuggestedFilename(*url, "", "", "", "", std::string());
- else
- title->clear();
- return true;
}
+ *url = GURL();
+ title->clear();
return false;
}
@@ -495,10 +466,8 @@ bool OSExchangeDataProviderWin::HasString() const {
bool OSExchangeDataProviderWin::HasURL(
OSExchangeData::FilenameToURLPolicy policy) const {
- return (ClipboardUtil::HasUrl(
- source_object_.get(),
- policy == OSExchangeData::CONVERT_FILENAMES ? true : false) ||
- HasPlainTextURL(source_object_.get()));
+ return ClipboardUtil::HasUrl(source_object_.get(),
+ policy == OSExchangeData::CONVERT_FILENAMES);
}
bool OSExchangeDataProviderWin::HasFile() const {
« ui/base/dragdrop/os_exchange_data.cc ('K') | « ui/base/dragdrop/os_exchange_data_provider_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698