Reland change for aura tooltips that was revert due to build break:

ui/views/widget/native_widget_aura.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #pragma once
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/window_drag_drop_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/native_widget_private.h"
 
 namespace aura {
 class Window;
 }
 namespace gfx {
 class Font;
 }
 
 namespace views {
 
 class DropHelper;
-class TooltipManagerViews;
+class TooltipManagerAura;
 
 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
                                       public aura::WindowDelegate,
                                       public aura::WindowDragDropDelegate {
  public:
   explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetAura();
 
   // TODO(beng): Find a better place for this, and the similar method on
   //             NativeWidgetWin.
@@ skipping 123 matching lines @@
 
   // The following factory is used for calls to close the NativeWidgetAura
   // instance.
   base::WeakPtrFactory<NativeWidgetAura> close_widget_factory_;
 
   // Can we be made active?
   bool can_activate_;
 
   gfx::NativeCursor cursor_;
 
-  scoped_ptr<TooltipManagerViews> tooltip_manager_;
+  scoped_ptr<TooltipManagerAura> tooltip_manager_;
 
   scoped_ptr<DesktopObserverImpl> desktop_observer_;
 
   scoped_ptr<DropHelper> drop_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_