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

Unified Diff: ash/tooltips/tooltip_controller.cc

Issue 10151001: aura: Do not show tooltips if mouse cursor is hidden. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 8 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
« no previous file with comments | « no previous file | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller.cc
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index d3efc1fe0c0f8ae5e8eebad7adddd0e6cbb9697d..ba69352dd915a60e7ec42f24467d602d8ac8de62 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;
}
« no previous file with comments | « no previous file | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698