Merge 244538 "Don't populate URL data in WebDropData when draggi..."

chrome/browser/ui/views/omnibox/omnibox_view_views.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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 787 matching lines @@
   *formats = *formats | ui::OSExchangeData::URL;
 }
 
 int OmniboxViewViews::OnDrop(const ui::OSExchangeData& data) {
   if (HasTextBeingDragged())
     return ui::DragDropTypes::DRAG_NONE;
 
   if (data.HasURL()) {
     GURL url;
     base::string16 title;
-    if (data.GetURLAndTitle(&url, &title)) {
+    if (data.GetURLAndTitle(
+            ui::OSExchangeData::CONVERT_FILENAMES, &url, &title)) {
       base::string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
       if (model()->CanPasteAndGo(text)) {
         model()->PasteAndGo(text);
         return ui::DragDropTypes::DRAG_COPY;
       }
     }
   } else if (data.HasString()) {
     base::string16 text;
     if (data.GetString(&text)) {
       base::string16 collapsed_text(CollapseWhitespace(text, true));
@@ skipping 153 matching lines @@
   const base::string16 text(GetClipboardText());
   if (!text.empty()) {
     // Record this paste, so we can do different behavior.
     model()->OnPaste();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted.
     text_before_change_.clear();
     InsertOrReplaceText(text);
   }
 }