Consolidate Widget Event code, other cleanup.

views/widget/aero_tooltip_manager.cc

Index: views/widget/aero_tooltip_manager.cc
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index 8a5cacaf4b055330382a13b3dbdc50adf6d0e340..8cc6821353450162f78dfb31e13c111526a865f1 100644
--- a/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -28,6 +28,12 @@ AeroTooltipManager::~AeroTooltipManager() {
 }
 
 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();
 
@@ -62,11 +68,6 @@ void AeroTooltipManager::OnMouse(UINT u_msg, WPARAM w_param, LPARAM l_param) {
   }
 }
 
-void AeroTooltipManager::OnMouseLeave() {
-  last_mouse_pos_.SetPoint(-1, -1);
-  UpdateTooltip();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // AeroTooltipManager, private: