Commit 0f55724a authored by sangwoo.ko's avatar sangwoo.ko Committed by Commit Bot

Allow plain strings to be dropped

As we can convert plain strings into query url,
We shouldn't block non-urls.

Bug: 838794
Change-Id: Iaceaf0627a95c11382a4dee72d62a7af2a4e78bd
Reviewed-on: https://chromium-review.googlesource.com/1041367
Commit-Queue: Sang Woo Ko <sangwoo108@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556310}
parent 3ec41bc2
...@@ -165,7 +165,7 @@ int BrowserRootView::OnDragUpdated(const ui::DropTargetEvent& event) { ...@@ -165,7 +165,7 @@ int BrowserRootView::OnDragUpdated(const ui::DropTargetEvent& event) {
drop_info_->target->HandleDragExited(); drop_info_->target->HandleDragExited();
drop_info_->target = drop_target; drop_info_->target = drop_target;
if (!drop_info_->file_supported || !drop_info_->url.is_valid() || if (!drop_info_->file_supported ||
drop_info_->url.SchemeIs(url::kJavaScriptScheme)) { drop_info_->url.SchemeIs(url::kJavaScriptScheme)) {
drop_info_->index.reset(); drop_info_->index.reset();
} else { } else {
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "chrome/browser/ui/views/frame/browser_root_view.h" #include "chrome/browser/ui/views/frame/browser_root_view.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/views/scoped_macviews_browser_mode.h" #include "chrome/test/views/scoped_macviews_browser_mode.h"
...@@ -39,3 +40,15 @@ IN_PROC_BROWSER_TEST_F(BrowserRootViewBrowserTest, ClearDropInfo) { ...@@ -39,3 +40,15 @@ IN_PROC_BROWSER_TEST_F(BrowserRootViewBrowserTest, ClearDropInfo) {
root_view->OnPerformDrop(event); root_view->OnPerformDrop(event);
EXPECT_FALSE(root_view->drop_info_); EXPECT_FALSE(root_view->drop_info_);
} }
// Make sure plain string is droppable. http://crbug.com/838794
IN_PROC_BROWSER_TEST_F(BrowserRootViewBrowserTest, PlainString) {
ui::OSExchangeData data;
data.SetString(base::ASCIIToUTF16("Plain string"));
ui::DropTargetEvent event(data, gfx::Point(), gfx::Point(),
ui::DragDropTypes::DRAG_COPY);
BrowserRootView* root_view = browser_root_view();
EXPECT_NE(ui::DragDropTypes::DRAG_NONE, root_view->OnDragUpdated(event));
EXPECT_NE(ui::DragDropTypes::DRAG_NONE, root_view->OnPerformDrop(event));
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment