summaryrefslogtreecommitdiffstats
path: root/ash/tooltips/tooltip_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/tooltips/tooltip_controller.cc')
-rw-r--r--ash/tooltips/tooltip_controller.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index d3efc1f..ba69352 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -372,7 +372,8 @@ void TooltipController::TooltipTimerFired() {
}
void TooltipController::UpdateIfRequired() {
- if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress()) {
+ if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() ||
+ !Shell::GetRootWindow()->cursor_shown()) {
tooltip_->Hide();
return;
}