Consolidate Widget Event code, other cleanup.

views/widget/aero_tooltip_manager.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/aero_tooltip_manager.h"
 
 #include <windows.h>
 #include <commctrl.h>
 #include <shlobj.h>
 
 #include "base/message_loop.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/point.h"
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroTooltipManager, public:
 
 AeroTooltipManager::AeroTooltipManager(Widget* widget)
     : TooltipManagerWin(widget),
       initial_delay_(0) {
 }
 
 AeroTooltipManager::~AeroTooltipManager() {
   if (initial_timer_)
     initial_timer_->Disown();
 }
 
 void AeroTooltipManager::OnMouse(UINT u_msg, WPARAM w_param, LPARAM l_param) {
+  if (u_msg == WM_MOUSELEAVE) {
+    last_mouse_pos_.SetPoint(-1, -1);
+    UpdateTooltip();
+    return;
+  }
+
   if (initial_timer_)
     initial_timer_->Disown();
 
   if (u_msg == WM_MOUSEMOVE || u_msg == WM_NCMOUSEMOVE) {
     gfx::Point mouse_pos(l_param);
     if (u_msg == WM_NCMOUSEMOVE) {
       // NC message coordinates are in screen coordinates.
       POINT temp = mouse_pos.ToPOINT();
       ::MapWindowPoints(HWND_DESKTOP, GetParent(), &temp, 1);
       mouse_pos.SetPoint(temp.x, temp.y);
@@ skipping 14 matching lines @@
     initial_timer_ = new InitialTimer(this);
     initial_timer_->Start(initial_delay_);
   } else {
     // Hide the tooltip and cancel any timers.
     ::SendMessage(tooltip_hwnd_, TTM_POP, 0, 0);
     ::SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, false, (LPARAM)&toolinfo_);
     return;
   }
 }
 
-void AeroTooltipManager::OnMouseLeave() {
-  last_mouse_pos_.SetPoint(-1, -1);
-  UpdateTooltip();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // AeroTooltipManager, private:
 
 void AeroTooltipManager::Init() {
   // Create the tooltip control.
   tooltip_hwnd_ = CreateWindowEx(
       WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles(),
       TOOLTIPS_CLASS, NULL, TTS_NOPREFIX, 0, 0, 0, 0,
       GetParent(), NULL, NULL, NULL);
 
@@ skipping 44 matching lines @@
 void AeroTooltipManager::InitialTimer::Disown() {
   manager_ = NULL;
 }
 
 void AeroTooltipManager::InitialTimer::Execute() {
   if (manager_)
     manager_->OnTimer();
 }
 
 }  // namespace views