diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 02:16:44 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 02:16:44 +0000 |
| commit | 2711ac053ca80da1fe280db1bfe00696feb2a10a (patch) | |
| tree | a09a3350c1034d5ec888d8811727f43f4827404f /chrome/browser/views/tab_contents | |
| parent | e8d99021e731d5c491311e20c7ed4c92d2d52f4b (diff) | |
| download | chromium_src-2711ac053ca80da1fe280db1bfe00696feb2a10a.zip chromium_src-2711ac053ca80da1fe280db1bfe00696feb2a10a.tar.gz chromium_src-2711ac053ca80da1fe280db1bfe00696feb2a10a.tar.bz2 | |
Fix DCHECK in web_drop_target_win.cc.
Relax the DCHECK for asserting that only one drag op is set. WebKit occasionally only sets DragOperationMove to indicate a drag move, even though the usual convention is to set both DragOperationMove and DragOperationGeneric.
BUG=41670
TEST=none
Review URL: http://codereview.chromium.org/1513044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tab_contents')
| -rw-r--r-- | chrome/browser/views/tab_contents/tab_contents_drag_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc index 4b84313..21fc9fd 100644 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc @@ -290,7 +290,7 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data, DWORD effect; MessageLoop::current()->SetNestableTasksAllowed(true); DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source_, - web_drag_utils_win::WebDragOpToWinDragOp(ops), &effect); + web_drag_utils_win::WebDragOpMaskToWinDragOpMask(ops), &effect); // This works because WebDragSource::OnDragSourceDrop uses PostTask to // dispatch the actual event. drag_source_->set_effect(effect); |