Update TooltipManagerAura to respect View::GetTooltipText behavior that it

expects the return value to be empty.

BUG=232372

Review URL: https://chromiumcodereview.appspot.com/14400002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195627 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 23 insertions, 16 deletions

diff --git a/ui/views/widget/tooltip_manager_aura.cc b/ui/views/widget/tooltip_manager_aura.cc
index ff4ed22..cd8fd1b 100644
--- a/ui/views/widget/tooltip_manager_aura.cc
+++ b/ui/views/widget/tooltip_manager_aura.cc
@@ -58,14 +58,7 @@ void TooltipManagerAura::UpdateTooltip() {
     gfx::Point view_point = root_window->GetLastMouseLocationInRoot();
     aura::Window::ConvertPointToTarget(root_window, window_, &view_point);
     View* view = GetViewUnderPoint(view_point);
-    if (view) {
-      View::ConvertPointFromWidget(view, &view_point);
-      if (!view->GetTooltipText(view_point, &tooltip_text_))
-        tooltip_text_.clear();
-    } else {
-      tooltip_text_.clear();
-    }
-    aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_);
+    UpdateTooltipForTarget(view, view_point, root_window);
   }
 }
 
@@ -77,14 +70,7 @@ void TooltipManagerAura::TooltipTextChanged(View* view)  {
     View* target = GetViewUnderPoint(view_point);
     if (target != view)
       return;
-    if (target) {
-      View::ConvertPointFromWidget(view, &view_point);
-      if (!view->GetTooltipText(view_point, &tooltip_text_))
-        tooltip_text_.clear();
-    } else {
-      tooltip_text_.clear();
-    }
-    aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_);
+    UpdateTooltipForTarget(view, view_point, root_window);
   }
 }
 
@@ -103,4 +89,21 @@ View* TooltipManagerAura::GetViewUnderPoint(const gfx::Point& point) {
   return NULL;
 }
 
+void TooltipManagerAura::UpdateTooltipForTarget(View* target,
+                                                const gfx::Point& point,
+                                                aura::RootWindow* root_window) {
+  if (target) {
+    gfx::Point view_point = point;
+    View::ConvertPointFromWidget(target, &view_point);
+    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();
+  }
+  aura::client::GetTooltipClient(root_window)->UpdateTooltip(window_);
+}
+
 }  // namespace views.
diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h
index 6158820..784065a 100644
--- a/ui/views/widget/tooltip_manager_aura.h
+++ b/ui/views/widget/tooltip_manager_aura.h
@@ -11,6 +11,7 @@
 #include "ui/views/widget/tooltip_manager.h"
 
 namespace aura {
+class RootWindow;
 class Window;
 }
 
@@ -32,6 +33,9 @@ class TooltipManagerAura : public TooltipManager {
 
  private:
   View* GetViewUnderPoint(const gfx::Point& point);
+  void UpdateTooltipForTarget(View* target,
+                              const gfx::Point& point,
+                              aura::RootWindow* root_window);
 
   aura::Window* window_;
   Widget* widget_;