Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 139983009: ui::LocatedEvent location() returns gfx::PointF (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo accidental change. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 914c1d24a83c462a87c35a24314b3c2cb8a4f00d..c7622e61ead61e97dc28f0e7b9530ab05e0eab38 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -1101,14 +1101,18 @@ void DesktopNativeWidgetAura::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
void DesktopNativeWidgetAura::OnDragEntered(const ui::DropTargetEvent& event) {
DCHECK(drop_helper_.get() != NULL);
- last_drop_operation_ = drop_helper_->OnDragOver(event.data(),
- event.location(), event.source_operations());
+ last_drop_operation_ =
+ drop_helper_->OnDragOver(event.data(),
+ gfx::ToFlooredPoint(event.location()),
+ event.source_operations());
}
int DesktopNativeWidgetAura::OnDragUpdated(const ui::DropTargetEvent& event) {
DCHECK(drop_helper_.get() != NULL);
- last_drop_operation_ = drop_helper_->OnDragOver(event.data(),
- event.location(), event.source_operations());
+ last_drop_operation_ =
+ drop_helper_->OnDragOver(event.data(),
+ gfx::ToFlooredPoint(event.location()),
+ event.source_operations());
return last_drop_operation_;
}
@@ -1120,8 +1124,9 @@ void DesktopNativeWidgetAura::OnDragExited() {
int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
DCHECK(drop_helper_.get() != NULL);
Activate();
- return drop_helper_->OnDrop(event.data(), event.location(),
- last_drop_operation_);
+ return drop_helper_->OnDrop(event.data(),
+ gfx::ToFlooredPoint(event.location()),
+ last_drop_operation_);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698