Aura build fix: Make TooltipManagerViews an observer of parent Widget and

views/widget/tooltip_manager_views.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 "views/widget/tooltip_manager_views.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 57 matching lines @@
   gfx::Rect monitor_bounds =
       gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
   // GtkLabel (gtk_label_ensure_layout) forces wrapping at this size. We mirror
   // the size here otherwise tooltips wider than the size used by gtklabel end
   // up with extraneous empty lines.
   return monitor_bounds.width() == 0 ? 800 : (monitor_bounds.width() + 1) / 2;
 }
 
 TooltipManagerViews::TooltipManagerViews(views::View* root_view)
     : root_view_(root_view),
-      tooltip_view_(NULL) {
+      tooltip_view_(NULL),
+      widget_closed_(false) {
   tooltip_label_.set_background(
       views::Background::CreateSolidBackground(kTooltipBackground));
   tooltip_widget_.reset(CreateTooltip());
   tooltip_widget_->SetContentsView(&tooltip_label_);
   tooltip_widget_->Activate();
   tooltip_widget_->SetAlwaysOnTop(true);
   tooltip_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
       this, &TooltipManagerViews::TooltipTimerFired);
   MessageLoopForUI::current()->AddObserver(this);
+  root_view_->GetWidget()->AddObserver(this);
 }
 
 TooltipManagerViews::~TooltipManagerViews() {
   MessageLoopForUI::current()->RemoveObserver(this);
   tooltip_widget_->CloseNow();
 }
 
 void TooltipManagerViews::UpdateTooltip() {
   UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
 }
@@ skipping 44 matching lines @@
     const base::NativeEvent& event) {
   if (event.message == WM_MOUSEMOVE)
     OnMouseMoved(GET_X_LPARAM(event.lParam), GET_Y_LPARAM(event.lParam));
   return base::EVENT_CONTINUE;
 }
 
 void TooltipManagerViews::DidProcessEvent(const base::NativeEvent& event) {
 }
 #endif
 
+void TooltipManagerViews::OnWidgetClosing(Widget* widget) {
+  tooltip_timer_.Stop();
+  widget_closed_ = true;
+}
+
 void TooltipManagerViews::TooltipTimerFired() {
   UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
 }
 
 View* TooltipManagerViews::GetViewForTooltip(int x, int y, bool for_keyboard) {
   View* view = NULL;
   if (!for_keyboard) {
     // Convert x,y from screen coordinates to |root_view_| coordinates.
     gfx::Point point(x, y);
     gfx::Rect r = root_view_->GetWidget()->GetClientAreaScreenBounds();
     point.SetPoint(point.x() - r.x(), point.y() - r.y());
     View::ConvertPointFromWidget(root_view_, &point);
     view = root_view_->GetEventHandlerForPoint(point);
   } else {
     FocusManager* focus_manager = root_view_->GetFocusManager();
     if (focus_manager)
       view = focus_manager->GetFocusedView();
   }
   return view;
 }
 
 void TooltipManagerViews::UpdateIfRequired(int x, int y, bool for_keyboard) {
+  if (widget_closed_)
+    return;
+
   View* view = GetViewForTooltip(x, y, for_keyboard);
   string16 tooltip_text;
   if (view)
     view->GetTooltipText(gfx::Point(x, y), &tooltip_text);
 
 #if defined(USE_AURA)
   // In aura, and aura::Window can also have a tooltip. If the view doesnot have
   // a tooltip, we must also check for the aura::Window underneath the cursor.
   if (tooltip_text.empty()) {
     aura::Window* root = reinterpret_cast<aura::Window*>(
@@ skipping 62 matching lines @@
   if (tooltip_timer_.IsRunning())
     tooltip_timer_.Reset();
   curr_mouse_pos_.SetPoint(x, y);
 
   // If tooltip is visible, we may want to hide it. If it is not, we are ok.
   if (tooltip_widget_->IsVisible())
     UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
 }
 
 }  // namespace views