Don't populate WebDropData with file URLs when dragging files.

app/clipboard/clipboard_util_win.cc

 // Copyright (c) 2010 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 "app/clipboard/clipboard_util_win.h"
 
 #include <shellapi.h>
 #include <shlwapi.h>
 #include <wininet.h>
 
@@ skipping 46 matching lines @@
   size_t newline_pos = str.find('\n');
   if (newline_pos != std::wstring::npos) {
     url->assign(str, 0, newline_pos);
     title->assign(str, newline_pos + 1, std::wstring::npos);
   } else {
     url->assign(str);
     title->assign(str);
   }
 }
 
+bool GetFileUrl(IDataObject* data_object, std::wstring* url,
+                std::wstring* title) {
+  STGMEDIUM store;
+  if (SUCCEEDED(data_object->GetData(ClipboardUtil::GetFilenameWFormat(),
+                                     &store))) {
+    bool success = false;
+    {
+      // filename using unicode
+      ScopedHGlobal<wchar_t> data(store.hGlobal);
+      if (data.get() && data.get()[0] &&
+          (PathFileExists(data.get()) || PathIsUNC(data.get()))) {
+        wchar_t file_url[INTERNET_MAX_URL_LENGTH];
+        DWORD file_url_len = arraysize(file_url);
+        if (SUCCEEDED(::UrlCreateFromPathW(data.get(), file_url, &file_url_len,
+                                           0))) {
+          url->assign(file_url);
+          title->assign(file_url);
+          success = true;
+        }
+      }
+    }
+    ReleaseStgMedium(&store);
+    if (success)
+      return true;
+  }
+
+  if (SUCCEEDED(data_object->GetData(ClipboardUtil::GetFilenameFormat(),
+                                     &store))) {
+    bool success = false;
+    {
+      // filename using ascii
+      ScopedHGlobal<char> data(store.hGlobal);
+      if (data.get() && data.get()[0] && (PathFileExistsA(data.get()) ||
+                                          PathIsUNCA(data.get()))) {
+        char file_url[INTERNET_MAX_URL_LENGTH];
+        DWORD file_url_len = arraysize(file_url);
+        if (SUCCEEDED(::UrlCreateFromPathA(data.get(), file_url, &file_url_len,
+                                           0))) {
+          url->assign(UTF8ToWide(file_url));
+          title->assign(*url);
+          success = true;
+        }
+      }
+    }
+    ReleaseStgMedium(&store);
+    if (success)
+      return true;
+  }
+  return false;
+}
+
 }  // namespace
 
 
 FORMATETC* ClipboardUtil::GetUrlFormat() {
   static UINT cf = RegisterClipboardFormat(CFSTR_INETURLA);
   static FORMATETC format = {cf, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
   return &format;
 }
 
 FORMATETC* ClipboardUtil::GetUrlWFormat() {
@@ skipping 98 matching lines @@
 }
 
 bool ClipboardUtil::HasPlainText(IDataObject* data_object) {
   DCHECK(data_object);
   return SUCCEEDED(data_object->QueryGetData(GetPlainTextWFormat())) ||
       SUCCEEDED(data_object->QueryGetData(GetPlainTextFormat()));
 }
 
 
 bool ClipboardUtil::GetUrl(IDataObject* data_object,
-    std::wstring* url, std::wstring* title) {
+    std::wstring* url, std::wstring* title, bool convert_filenames) {
   DCHECK(data_object && url && title);
   if (!HasUrl(data_object))
     return false;
 
   // Try to extract a URL from |data_object| in a variety of formats.
   STGMEDIUM store;
   if (GetUrlFromHDrop(data_object, url, title))
     return true;
 
   if (SUCCEEDED(data_object->GetData(GetMozUrlFormat(), &store)) ||
@@ skipping 10 matching lines @@
   if (SUCCEEDED(data_object->GetData(GetUrlFormat(), &store))) {
     {
       // URL using ascii
       ScopedHGlobal<char> data(store.hGlobal);
       SplitUrlAndTitle(UTF8ToWide(data.get()), url, title);
     }
     ReleaseStgMedium(&store);
     return true;
   }
 
-  if (SUCCEEDED(data_object->GetData(GetFilenameWFormat(), &store))) {
-    bool success = false;
-    {
-      // filename using unicode
-      ScopedHGlobal<wchar_t> data(store.hGlobal);
-      if (data.get() && data.get()[0] &&
-          (PathFileExists(data.get()) || PathIsUNC(data.get()))) {
-        wchar_t file_url[INTERNET_MAX_URL_LENGTH];
-        DWORD file_url_len = arraysize(file_url);
-        if (SUCCEEDED(::UrlCreateFromPathW(data.get(), file_url, &file_url_len,
-                                           0))) {
-          url->assign(file_url);
-          title->assign(file_url);
-          success = true;
-        }
-      }
-    }
-    ReleaseStgMedium(&store);
-    if (success)
-      return true;
+  if (convert_filenames) {
+    return GetFileUrl(data_object, url, title);
+  } else {
+    return false;
   }
-
-  if (SUCCEEDED(data_object->GetData(GetFilenameFormat(), &store))) {
-    bool success = false;
-    {
-      // filename using ascii
-      ScopedHGlobal<char> data(store.hGlobal);
-      if (data.get() && data.get()[0] && (PathFileExistsA(data.get()) ||
-                                          PathIsUNCA(data.get()))) {
-        char file_url[INTERNET_MAX_URL_LENGTH];
-        DWORD file_url_len = arraysize(file_url);
-        if (SUCCEEDED(::UrlCreateFromPathA(data.get(), file_url, &file_url_len,
-                                           0))) {
-          url->assign(UTF8ToWide(file_url));
-          title->assign(*url);
-          success = true;
-        }
-      }
-    }
-    ReleaseStgMedium(&store);
-    if (success)
-      return true;
-  }
-
-  return false;
 }
 
 bool ClipboardUtil::GetFilenames(IDataObject* data_object,
                                  std::vector<std::wstring>* filenames) {
   DCHECK(data_object && filenames);
   if (!HasFilenames(data_object))
     return false;
 
   STGMEDIUM medium;
   if (FAILED(data_object->GetData(GetCFHDropFormat(), &medium)))
@@ skipping 42 matching lines @@
       ScopedHGlobal<char> data(store.hGlobal);
       plain_text->assign(UTF8ToWide(data.get()));
     }
     ReleaseStgMedium(&store);
     return true;
   }
 
   // If a file is dropped on the window, it does not provide either of the
   // plain text formats, so here we try to forcibly get a url.
   std::wstring title;
-  return GetUrl(data_object, plain_text, &title);
+  return GetUrl(data_object, plain_text, &title, false);
 }
 
 bool ClipboardUtil::GetHtml(IDataObject* data_object,
                             std::wstring* html, std::string* base_url) {
   DCHECK(data_object && html && base_url);
 
   STGMEDIUM store;
   if (SUCCEEDED(data_object->QueryGetData(GetHtmlFormat())) &&
       SUCCEEDED(data_object->GetData(GetHtmlFormat(), &store))) {
     {
@@ skipping 185 matching lines @@
       size_t tag_end = cf_html.rfind("<!--EndFragment", std::string::npos);
       fragment_end = cf_html.rfind('<', tag_end);
     }
     if (fragment_start != std::string::npos &&
         fragment_end != std::string::npos) {
       *html = cf_html.substr(fragment_start, fragment_end - fragment_start);
       TrimWhitespace(*html, TRIM_ALL, html);
     }
   }
 }