| Index: ui/base/dragdrop/os_exchange_data_provider_aura.cc
|
| diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
|
| index 009c3eec9b544ed796cf9b3b7d901ebcf2ce0280..e4e6bfa51c9d80dd7d39bc6a9923fbdf0ec5f649 100644
|
| --- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc
|
| +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
|
| @@ -90,10 +90,8 @@ bool OSExchangeDataProviderAura::GetURLAndTitle(
|
| GURL* url,
|
| base::string16* title) const {
|
| // TODO(dcheng): implement filename conversion.
|
| - if ((formats_ & OSExchangeData::URL) == 0) {
|
| - title->clear();
|
| - return GetPlainTextURL(url);
|
| - }
|
| + if ((formats_ & OSExchangeData::URL) == 0)
|
| + return false;
|
|
|
| if (!url_.is_valid())
|
| return false;
|
| @@ -137,11 +135,7 @@ bool OSExchangeDataProviderAura::HasString() const {
|
| bool OSExchangeDataProviderAura::HasURL(
|
| OSExchangeData::FilenameToURLPolicy policy) const {
|
| // TODO(dcheng): implement filename conversion.
|
| - if ((formats_ & OSExchangeData::URL) != 0) {
|
| - return true;
|
| - }
|
| - // No URL, see if we have plain text that can be parsed as a URL.
|
| - return GetPlainTextURL(NULL);
|
| + return formats_ & OSExchangeData::URL;
|
| }
|
|
|
| bool OSExchangeDataProviderAura::HasFile() const {
|
| @@ -189,19 +183,6 @@ OSExchangeDataProviderAura::GetDragImageOffset() const {
|
| return drag_image_offset_;
|
| }
|
|
|
| -bool OSExchangeDataProviderAura::GetPlainTextURL(GURL* url) const {
|
| - if ((formats_ & OSExchangeData::STRING) == 0)
|
| - return false;
|
| -
|
| - GURL test_url(string_);
|
| - if (!test_url.is_valid())
|
| - return false;
|
| -
|
| - if (url)
|
| - *url = test_url;
|
| - return true;
|
| -}
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // OSExchangeData, public:
|
|
|
|
|