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

Unified Diff: ui/views/view.cc

Issue 1518463002: Hides ink ripple when a button drag is started (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « ui/views/view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 4aa6d5a9fe2c0629d1c449f3908a1f6dbc402ea1..76c5752a9096e4693be6a4a5287c739a61f0159f 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1285,6 +1285,9 @@ int View::OnPerformDrop(const ui::DropTargetEvent& event) {
return ui::DragDropTypes::DRAG_NONE;
}
+void View::OnDragStarted(const ui::LocatedEvent& event) {
+}
+
void View::OnDragDone() {
}
@@ -2193,9 +2196,11 @@ bool View::ProcessMouseDragged(const ui::MouseEvent& event) {
(!drag_controller_ ||
drag_controller_->CanStartDragForView(
this, GetDragInfo()->start_pt, event.location()))) {
+ LOG(ERROR) << __FUNCTION__ << " calling DoDrag";
bruthig 2015/12/09 17:35:06 Don't forget to remove these log statements.
varkha 2015/12/09 17:42:53 Done.
DoDrag(event, GetDragInfo()->start_pt,
ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
} else {
+ LOG(ERROR) << __FUNCTION__ << " calling OnMouseDragged";
if (OnMouseDragged(event))
return true;
// Fall through to return value based on context menu controller.
@@ -2380,6 +2385,8 @@ bool View::DoDrag(const ui::LocatedEvent& event,
if (widget->dragged_view())
return false;
+ OnDragStarted(event);
+
OSExchangeData data;
WriteDragData(press_pt, &data);
« no previous file with comments | « ui/views/view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698