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

ui/views/widget/native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/shadow_types.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/desktop_observer.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_delegate.h"
-#include "ui/views/widget/tooltip_manager_views.h"
+#include "ui/views/widget/tooltip_manager_aura.h"
+#include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(HAVE_IBUS)
 #include "ui/views/ime/input_method_ibus.h"
 #else
@@ skipping 113 matching lines @@
       parent->AddTransientChild(window_);
     // SetAlwaysOnTop before SetParent so that always-on-top container is used.
     SetAlwaysOnTop(params.keep_on_top);
     window_->SetParent(NULL);
   }
   window_->set_ignore_events(!params.accept_events);
   // TODO(beng): do this some other way.
   delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
   can_activate_ = params.can_activate;
   DCHECK(GetWidget()->GetRootView());
-  if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) {
-    views::TooltipManagerViews* manager = new views::TooltipManagerViews(
-        GetWidget()->GetRootView());
-    tooltip_manager_.reset(manager);
+  if (params.type != Widget::InitParams::TYPE_TOOLTIP) {
+    tooltip_manager_.reset(new views::TooltipManagerAura(this));
   }
 
   drop_helper_.reset(new DropHelper(GetWidget()->GetRootView()));
   if (params.type != Widget::InitParams::TYPE_TOOLTIP &&
       params.type != Widget::InitParams::TYPE_POPUP) {
     window_->SetProperty(aura::kDragDropDelegateKey,
         static_cast<aura::WindowDragDropDelegate*>(this));
   }
 
   if (window_type == Widget::InitParams::TYPE_MENU)
@@ skipping 418 matching lines @@
 }
 
 int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const {
   return delegate_->GetNonClientComponent(point);
 }
 
 bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) {
   DCHECK(window_->IsVisible());
   if (event->type() == ui::ET_MOUSEWHEEL) {
     MouseWheelEvent wheel_event(event);
-    if (tooltip_manager_.get())
-      tooltip_manager_->UpdateForMouseEvent(wheel_event);
     return delegate_->OnMouseEvent(wheel_event);
   }
   MouseEvent mouse_event(event);
   if (tooltip_manager_.get())
-    tooltip_manager_->UpdateForMouseEvent(mouse_event);
+    tooltip_manager_->UpdateTooltip();
   return delegate_->OnMouseEvent(mouse_event);
 }
 
 ui::TouchStatus NativeWidgetAura::OnTouchEvent(aura::TouchEvent* event) {
   DCHECK(window_->IsVisible());
   TouchEvent touch_event(event);
   return delegate_->OnTouchEvent(touch_event);
 }
 
 bool NativeWidgetAura::ShouldActivate(aura::Event* event) {
@@ skipping 149 matching lines @@
   NOTIMPLEMENTED();
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Desktop::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views