diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 21:44:19 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 21:44:19 +0000 |
commit | 302e0e1a827df92e6eba995ce589a871954f5bf2 (patch) | |
tree | 0dd29c01c54948b297e258828b91f2776c18f08c /views/widget/drop_helper.cc | |
parent | 3af66ca4e22b15e29a96794f5a9f4ab356d17b87 (diff) | |
download | chromium_src-302e0e1a827df92e6eba995ce589a871954f5bf2.zip chromium_src-302e0e1a827df92e6eba995ce589a871954f5bf2.tar.gz chromium_src-302e0e1a827df92e6eba995ce589a871954f5bf2.tar.bz2 |
Reverts recent patch as broke build on toolkit_views.
TBR=ben
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/drop_helper.cc')
-rw-r--r-- | views/widget/drop_helper.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/views/widget/drop_helper.cc b/views/widget/drop_helper.cc index 19b70b71..35dcbd0 100644 --- a/views/widget/drop_helper.cc +++ b/views/widget/drop_helper.cc @@ -87,10 +87,6 @@ View* DropHelper::CalculateTargetViewImpl( } if (deepest_view) *deepest_view = view; - // TODO(sky): for the time being these are separate. Once I port chrome menu - // I can switch to the #else implementation and nuke the OS_WIN - // implementation. -#if defined(OS_WIN) // View under mouse changed, which means a new view may want the drop. // Walk the tree, stopping at target_view_ as we know it'll accept the // drop. @@ -98,22 +94,6 @@ View* DropHelper::CalculateTargetViewImpl( (!view->IsEnabled() || !view->CanDrop(data))) { view = view->GetParent(); } -#else - int formats = 0; - std::set<OSExchangeData::CustomFormat> custom_formats; - while (view && view != target_view_) { - if (view->IsEnabled() && - view->GetDropFormats(&formats, &custom_formats) && - data.HasAnyFormat(formats, custom_formats) && - (!check_can_drop || view->CanDrop(data))) { - // Found the view. - return view; - } - formats = 0; - custom_formats.clear(); - view = view->GetParent(); - } -#endif return view; } |