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

ui/views/widget/tooltip_manager_aura.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/widget/tooltip_manager_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/view.h"

[sky, 2014/04/23 20:08:46]

not needed.

[Mikus, 2014/04/24 08:39:56]

Done.

 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/tooltip_client.h"
 
 namespace views {
 
 // static
 int TooltipManager::GetTooltipHeight() {
   // Not used for linux and chromeos.
   NOTIMPLEMENTED();
   return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TooltipManagerAura public:
 
-TooltipManagerAura::TooltipManagerAura(Widget* widget) : widget_(widget) {
-  aura::client::SetTooltipText(GetWindow(), &tooltip_text_);
+TooltipManagerAura::TooltipManagerAura(Widget* widget)
+    : widget_(widget), tooltip_unique_(NULL) {
+  aura::client::SetTooltipText(GetWindow(), &tooltip_text_, &tooltip_unique_);
 }
 
 TooltipManagerAura::~TooltipManagerAura() {
-  aura::client::SetTooltipText(GetWindow(), NULL);
+  aura::client::SetTooltipText(GetWindow(), NULL, NULL);
 }
 
 // static
 const gfx::FontList& TooltipManagerAura::GetDefaultFontList() {
   return ui::ResourceBundle::GetSharedInstance().GetFontList(
       ui::ResourceBundle::BaseFont);
 }
 
 // static
 void TooltipManagerAura::UpdateTooltipManagerForCapture(Widget* source) {
@@ skipping 70 matching lines @@
 View* TooltipManagerAura::GetViewUnderPoint(const gfx::Point& point) {
   View* root_view = widget_->GetRootView();
   if (root_view)
     return root_view->GetTooltipHandlerForPoint(point);
   return NULL;
 }
 
 void TooltipManagerAura::UpdateTooltipForTarget(View* target,
                                                 const gfx::Point& point,
                                                 aura::Window* root_window) {
+  bool related = false;

[sky, 2014/04/23 20:08:46]

not needed.

[Mikus, 2014/04/24 08:39:56]

Done.

   if (target) {
     gfx::Point view_point = point;
     View::ConvertPointFromWidget(target, &view_point);
     base::string16 new_tooltip_text;
     if (!target->GetTooltipText(view_point, &new_tooltip_text))
       tooltip_text_.clear();
     else
       tooltip_text_ = new_tooltip_text;
   } else {
     tooltip_text_.clear();
   }
+
+  tooltip_unique_ = target;
+
   aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow());
 }
 
 aura::Window* TooltipManagerAura::GetWindow() {
   return widget_->GetNativeView();
 }
 
 }  // namespace views.