summaryrefslogtreecommitdiffstats
path: root/views/widget/aero_tooltip_manager.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 20:38:03 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 20:38:03 +0000
commit66e5af67ff42c6db608aad2bc87393c468c8a642 (patch)
tree7ba907d99e1c86e0680ef8e4282cc9973a2d36bd /views/widget/aero_tooltip_manager.cc
parent5332b834259dbab2ebbefba1944824df469139d4 (diff)
downloadchromium_src-66e5af67ff42c6db608aad2bc87393c468c8a642.zip
chromium_src-66e5af67ff42c6db608aad2bc87393c468c8a642.tar.gz
chromium_src-66e5af67ff42c6db608aad2bc87393c468c8a642.tar.bz2
Consolidate Widget Event code, other cleanup.
Rename *NativeCapture to *MouseCapture. Rename and move ShouldReleaseCaptureOnMouseReleased. Move static flag function to Event. BUG=72040 TEST=Mouse interaction on win & linux_views. Review URL: http://codereview.chromium.org/6756043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/aero_tooltip_manager.cc')
-rw-r--r--views/widget/aero_tooltip_manager.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index 8a5caca..8cc6821 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: