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

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

Issue 135633002: Don't populate URL data in WebDropData when dragging files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Blink style enums Created 6 years, 11 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_aurax11.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
index ebea65959db6c3afc8e2ceacf23159ae7b2fe92c..3320dcfde3e021a3a632a029867c8500e858bdec 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -197,6 +197,7 @@ bool OSExchangeDataProviderAuraX11::GetString(base::string16* result) const {
}
bool OSExchangeDataProviderAuraX11::GetURLAndTitle(
+ OSExchangeData::FilenameToURLPolicy policy,
GURL* url,
base::string16* title) const {
std::vector< ::Atom> url_atoms = ui::GetURLAtomsFrom(&atom_cache_);
@@ -231,7 +232,8 @@ bool OSExchangeDataProviderAuraX11::GetURLAndTitle(
for (std::vector<std::string>::const_iterator it = tokens.begin();
it != tokens.end(); ++it) {
GURL test_url(*it);
- if (!test_url.SchemeIsFile()) {
+ if (!test_url.SchemeIsFile() ||
+ policy == OSExchangeData::CONVERT_FILENAMES) {
*url = test_url;
*title = base::string16();
return true;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11.h ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698