Two changes to desktop aura for tooltips:

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index ce95139529a3dcdfc664ecb9b6e73f9fc3919ec5..1b25199e75b4c216ec672b983ee57cedbf01b6f0 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -29,7 +29,6 @@ class CompoundEventFilter;
 class InputMethodEventFilter;
 class ScopedCaptureClient;
 class ShadowController;
-class TooltipController;
 class VisibilityController;
 class WindowModalityController;
 }
@@ -37,6 +36,7 @@ class WindowModalityController;
 class DesktopRootWindowHost;
 class DropHelper;
 class NativeWidgetAuraWindowObserver;
+class ScopedTooltipClient;
 class TooltipManagerAura;
 class WindowReorderer;
 
@@ -247,7 +247,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   scoped_ptr<DropHelper> drop_helper_;
   int last_drop_operation_;
 
-  scoped_ptr<corewm::TooltipController> tooltip_controller_;
+  scoped_ptr<ScopedTooltipClient> scoped_tooltip_client_;
   scoped_ptr<TooltipManagerAura> tooltip_manager_;
 
   scoped_ptr<views::corewm::VisibilityController> visibility_controller_;