Aura tooltips do not move on mouse move in case of many neighboring views with the same label

ui/views/corewm/tooltip_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/tooltip_controller.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
@@ skipping 110 matching lines @@
   tooltip_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
       this, &TooltipController::TooltipTimerFired);
 }
 
 TooltipController::~TooltipController() {
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
 }
 
-void TooltipController::UpdateTooltip(aura::Window* target) {
+void TooltipController::UpdateTooltip(aura::Window* target,
+                                      bool force) {
   // If tooltip is visible, we may want to hide it. If it is not, we are ok.
   if (tooltip_window_ == target && tooltip_->IsVisible())
-    UpdateIfRequired();
+    UpdateIfRequired(force);
 
   // Reset |tooltip_window_at_mouse_press_| if the moving within the same window
   // but over a region that has different tooltip text. By resetting
   // |tooltip_window_at_mouse_press_| we ensure the next time the timer fires
   // we'll requery for the tooltip text.
   // This handles the case of clicking on a view, moving within the same window
   // but over a different view, than back to the original.
   if (tooltip_window_at_mouse_press_ &&
       target == tooltip_window_at_mouse_press_ &&
       aura::client::GetTooltipText(target) != tooltip_text_at_mouse_press_) {
@@ skipping 14 matching lines @@
 
 void TooltipController::SetTooltipShownTimeout(aura::Window* target,
                                                int timeout_in_ms) {
   tooltip_shown_timeout_map_[target] = timeout_in_ms;
 }
 
 void TooltipController::SetTooltipsEnabled(bool enable) {
   if (tooltips_enabled_ == enable)
     return;
   tooltips_enabled_ = enable;
-  UpdateTooltip(tooltip_window_);
+  UpdateTooltip(tooltip_window_, false);
 }
 
 void TooltipController::OnKeyEvent(ui::KeyEvent* event) {
   // On key press, we want to hide the tooltip and not show it until change.
   // This is the same behavior as hiding tooltips on timeout. Hence, we can
   // simply simulate a timeout.
   if (tooltip_shown_timer_.IsRunning()) {
     tooltip_shown_timer_.Stop();
     TooltipShownTimerFired();
   }
 }
 
 void TooltipController::OnMouseEvent(ui::MouseEvent* event) {
   switch (event->type()) {
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED: {
       curr_mouse_loc_ = event->location();
       aura::Window* target = GetTooltipTarget(*event, &curr_mouse_loc_);
       SetTooltipWindow(target);
       if (tooltip_timer_.IsRunning())
         tooltip_timer_.Reset();
 
       if (tooltip_->IsVisible())
-        UpdateIfRequired();
+        UpdateIfRequired(false);
       break;
     }
     case ui::ET_MOUSE_PRESSED:
       if ((event->flags() & ui::EF_IS_NON_CLIENT) == 0) {
         aura::Window* target = static_cast<aura::Window*>(event->target());
         // We don't get a release for non-client areas.
         tooltip_window_at_mouse_press_ = target;
         if (target)
           tooltip_text_at_mouse_press_ = aura::client::GetTooltipText(target);
       }
@@ skipping 26 matching lines @@
   if (tooltip_window_ == window) {
     tooltip_->Hide();
     tooltip_shown_timeout_map_.erase(tooltip_window_);
     tooltip_window_ = NULL;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TooltipController private:
 
-void TooltipController::TooltipTimerFired() {
-  UpdateIfRequired();
-}
+void TooltipController::TooltipTimerFired() { UpdateIfRequired(false); }
 
 void TooltipController::TooltipShownTimerFired() {
   tooltip_->Hide();
 
   // Since the user presumably no longer needs the tooltip, we also stop the
   // tooltip timer so that tooltip does not pop back up. We will restart this
   // timer if the tooltip changes (see UpdateTooltip()).
   tooltip_timer_.Stop();
 }
 
-void TooltipController::UpdateIfRequired() {
+void TooltipController::UpdateIfRequired(bool force) {
   if (!tooltips_enabled_ ||
       aura::Env::GetInstance()->IsMouseButtonDown() ||
       IsDragDropInProgress() || !IsCursorVisible()) {
     tooltip_->Hide();
     return;
   }
 
   base::string16 tooltip_text;
   if (tooltip_window_)
     tooltip_text = aura::client::GetTooltipText(tooltip_window_);
 
   // If the user pressed a mouse button. We will hide the tooltip and not show
   // it until there is a change in the tooltip.
   if (tooltip_window_at_mouse_press_) {
     if (tooltip_window_ == tooltip_window_at_mouse_press_ &&
         tooltip_text == tooltip_text_at_mouse_press_) {
       tooltip_->Hide();
       return;
     }
     tooltip_window_at_mouse_press_ = NULL;
   }
 
   // We add the !tooltip_->IsVisible() below because when we come here from
   // TooltipTimerFired(), the tooltip_text may not have changed but we still
   // want to update the tooltip because the timer has fired.
   // If we come here from UpdateTooltip(), we have already checked for tooltip
   // visibility and this check below will have no effect.
-  if (tooltip_text_ != tooltip_text || !tooltip_->IsVisible()) {
+  if (tooltip_text_ != tooltip_text || !tooltip_->IsVisible() || force) {
     tooltip_shown_timer_.Stop();
     tooltip_text_ = tooltip_text;
     base::string16 trimmed_text(tooltip_text_);
     views::TooltipManager::TrimTooltipText(&trimmed_text);
     // If the string consists entirely of whitespace, then don't both showing it
     // (an empty tooltip is useless).
     base::string16 whitespace_removed_text;
     base::TrimWhitespace(trimmed_text, base::TRIM_ALL,
                          &whitespace_removed_text);
     if (whitespace_removed_text.empty()) {
@@ skipping 50 matching lines @@
     return;
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
   tooltip_window_ = target;
   if (tooltip_window_)
     tooltip_window_->AddObserver(this);
 }
 
 }  // namespace corewm
 }  // namespace views