aura: Make aura::TooltipClient completely static?

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 0847ed3fa6b2f1feab811ae0cec2a09b3ba81288..716ce4a47a478e698add0a150b110957c42b297e 100644
--- a/ui/views/widget/tooltip_manager_aura.cc
+++ b/ui/views/widget/tooltip_manager_aura.cc
@@ -50,45 +50,35 @@ TooltipManagerAura::~TooltipManagerAura() {
 // TooltipManagerAura, TooltipManager implementation:
 
 void TooltipManagerAura::UpdateTooltip() {
-  void* property = aura::Desktop::GetInstance()->GetProperty(
-      aura::kDesktopTooltipClientKey);
-  if (property) {
-    gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
-    aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
-        native_widget_aura_->GetNativeView(), &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::TooltipClient* tc = static_cast<aura::TooltipClient*>(property);
-    tc->UpdateTooltip(native_widget_aura_->GetNativeView());
+  gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
+  aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
+      native_widget_aura_->GetNativeView(), &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::TooltipClient::UpdateTooltip(native_widget_aura_->GetNativeView());
 }
 
 void TooltipManagerAura::TooltipTextChanged(View* view)  {
-  void* property = aura::Desktop::GetInstance()->GetProperty(
-      aura::kDesktopTooltipClientKey);
-  if (property) {
-    gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
-    aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
-        native_widget_aura_->GetNativeView(), &view_point);
-    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::TooltipClient* tc = static_cast<aura::TooltipClient*>(property);
-    tc->UpdateTooltip(native_widget_aura_->GetNativeView());
+  gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
+  aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
+      native_widget_aura_->GetNativeView(), &view_point);
+  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::TooltipClient::UpdateTooltip(native_widget_aura_->GetNativeView());
 }
 
 void TooltipManagerAura::ShowKeyboardTooltip(View* view) {