diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 21:13:28 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-26 21:13:28 +0000 |
| commit | 6b9b735dc9ba95674f2ae3db94ef13bcfc7dada7 (patch) | |
| tree | a91c734fcc9e23134432c24314d91738d1b23c44 /chrome | |
| parent | 870a5bbf746ff2ed8b9f1410d83c1a506fb67273 (diff) | |
| download | chromium_src-6b9b735dc9ba95674f2ae3db94ef13bcfc7dada7.zip chromium_src-6b9b735dc9ba95674f2ae3db94ef13bcfc7dada7.tar.gz chromium_src-6b9b735dc9ba95674f2ae3db94ef13bcfc7dada7.tar.bz2 | |
Temporarily work around a hang in unimplemented drag and drop.
Review URL: http://codereview.chromium.org/53105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_view_gtk.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_view_mac.mm | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.cc b/chrome/browser/tab_contents/web_contents_view_gtk.cc index 8514d64..12c7b1c 100644 --- a/chrome/browser/tab_contents/web_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/web_contents_view_gtk.cc @@ -202,6 +202,13 @@ void WebContentsViewGtk::ShowContextMenu(const ContextMenuParams& params) { void WebContentsViewGtk::StartDragging(const WebDropData& drop_data) { NOTIMPLEMENTED(); + + // Until we have d'n'd implemented, just immediately pretend we're + // already done with the drag and drop so we don't get stuck + // thinking we're in mid-drag. + // TODO(port): remove me when the above NOTIMPLEMENTED is fixed. + if (web_contents()->render_view_host()) + web_contents()->render_view_host()->DragSourceSystemDragEnded(); } WebContents* WebContentsViewGtk::CreateNewWindowInternal( diff --git a/chrome/browser/tab_contents/web_contents_view_mac.mm b/chrome/browser/tab_contents/web_contents_view_mac.mm index 1cab6e6..c466a68 100644 --- a/chrome/browser/tab_contents/web_contents_view_mac.mm +++ b/chrome/browser/tab_contents/web_contents_view_mac.mm @@ -76,6 +76,13 @@ void WebContentsViewMac::GetContainerBounds(gfx::Rect* out) const { void WebContentsViewMac::StartDragging(const WebDropData& drop_data) { NOTIMPLEMENTED(); + + // Until we have d'n'd implemented, just immediately pretend we're + // already done with the drag and drop so we don't get stuck + // thinking we're in mid-drag. + // TODO(port): remove me when the above NOTIMPLEMENTED is fixed. + if (web_contents()->render_view_host()) + web_contents()->render_view_host()->DragSourceSystemDragEnded(); } void WebContentsViewMac::OnContentsDestroy() { |