Index: ui/views/corewm/tooltip_controller.cc |
diff --git a/ui/views/corewm/tooltip_controller.cc b/ui/views/corewm/tooltip_controller.cc |
index 500466fdf4d646c69ccba8f31c98ef85a8f9496c..7c6fae31177e516d17abb567e77f6963a83b5a15 100644 |
--- a/ui/views/corewm/tooltip_controller.cc |
+++ b/ui/views/corewm/tooltip_controller.cc |
@@ -185,6 +185,12 @@ void TooltipController::OnMouseEvent(ui::MouseEvent* event) { |
case ui::ET_MOUSE_EXITED: |
case ui::ET_MOUSE_MOVED: |
case ui::ET_MOUSE_DRAGGED: { |
+ if (!tooltips_enabled_ || |
sky
2014/05/20 20:43:22
I think this early out is too early. You still wan
varkha
2014/05/20 21:12:26
You are right - for the capture changes and mouse
|
+ aura::Env::GetInstance()->IsMouseButtonDown() || |
+ IsDragDropInProgress()) { |
+ break; |
+ } |
+ |
curr_mouse_loc_ = event->location(); |
aura::Window* target = GetTooltipTarget(*event, &curr_mouse_loc_); |
SetTooltipWindow(target); |