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

Index: ui/views/widget/tooltip_manager_aura.cc
diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc
index 986ea5d28680579208797a3cf42e3df838de4d4b..000ec9018629b1a1537bb37f3c84e7ef10752d65 100644
--- a/ui/views/widget/tooltip_manager_aura.cc
+++ b/ui/views/widget/tooltip_manager_aura.cc
@@ -11,6 +11,7 @@
 #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"
 
@@ -26,12 +27,13 @@ int TooltipManager::GetTooltipHeight() {
 ////////////////////////////////////////////////////////////////////////////////
 // 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
@@ -122,6 +124,7 @@ View* TooltipManagerAura::GetViewUnderPoint(const gfx::Point& point) {
 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);
@@ -133,6 +136,9 @@ void TooltipManagerAura::UpdateTooltipForTarget(View* target,
   } else {
     tooltip_text_.clear();
   }
+
+  tooltip_unique_ = target;
+
   aura::client::GetTooltipClient(root_window)->UpdateTooltip(GetWindow());
 }