Beginnings of Window Modality support.

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 78 matching lines @@
   switch (event.type()) {
     case ui::ET_MOUSE_EXITED:
       // Mouse is exiting this widget. Stop showing the tooltip and the timer.
       if (tooltip_timer_.IsRunning())
         tooltip_timer_.Stop();
       if (tooltip_widget_->IsVisible())
         tooltip_widget_->Hide();
       break;
     case ui::ET_MOUSE_ENTERED:
       // Mouse just entered this widget. Start the timer to show the tooltip.
-      CHECK(!tooltip_timer_.IsRunning());
+      if (tooltip_timer_.IsRunning())
+        tooltip_timer_.Stop();
       tooltip_timer_.Start(FROM_HERE,
           base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
           this, &TooltipManagerViews::TooltipTimerFired);
       break;
     case ui::ET_MOUSE_MOVED:
       OnMouseMoved(event.location().x(), event.location().y());
       break;
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_MOUSE_RELEASED:
     case ui::ET_MOUSE_DRAGGED:
@@ skipping 119 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