diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 22:34:43 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 22:34:43 +0000 |
commit | 80f7542ae0a6ce71a65485f1ddb3e86fd8ec6a89 (patch) | |
tree | a8d463d07ed5fddfe8e1c6e81b1b6404bea45d30 /views | |
parent | 4b5053b4e665784ecbb2b766f63960aff25c685d (diff) | |
download | chromium_src-80f7542ae0a6ce71a65485f1ddb3e86fd8ec6a89.zip chromium_src-80f7542ae0a6ce71a65485f1ddb3e86fd8ec6a89.tar.gz chromium_src-80f7542ae0a6ce71a65485f1ddb3e86fd8ec6a89.tar.bz2 |
Remove broken (and previously unused) OnMouseLeave overrides.
Both WindowWin and TabContentsViewWin had incorrect signatures to override WidgetWin::OnMouseLeave.
crrev.com/77221 mistakenly 'fixed' WindowWin::OnMouseLeave to actually override that of WidgetWin.
In this CL, remove the broken and previously unused overrides; add OVERRIDE keywords liberally.
BUG=75334,75367
TEST=repro and similar mouse interaction.
Review URL: http://codereview.chromium.org/6646053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r-- | views/window/window_win.cc | 28 | ||||
-rw-r--r-- | views/window/window_win.h | 3 |
2 files changed, 0 insertions, 31 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 46cb97b..1b2e648 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -471,34 +471,6 @@ void WindowWin::OnInitMenu(HMENU menu) { !is_minimized); } -LRESULT WindowWin::OnMouseLeave(UINT message, WPARAM w_param, LPARAM l_param) { - // We only need to manually track WM_MOUSELEAVE messages between the client - // and non-client area when we're not using the native frame. - if (delegate_->IsUsingNativeFrame()) { - SetMsgHandled(FALSE); - return 0; - } - - bool process_mouse_exited = true; - POINT pt; - if (GetCursorPos(&pt)) { - LRESULT ht_component = - ::SendMessage(GetNativeView(), WM_NCHITTEST, 0, MAKELPARAM(pt.x, pt.y)); - if (ht_component != HTNOWHERE) { - // If the mouse moved into a part of the window's non-client area, then - // don't send a mouse exited event since the mouse is still within the - // bounds of the ChromeView that's rendering the frame. Note that we do - // _NOT_ do this for windows with native frames, since in that case the - // mouse really will have left the bounds of the RootView. - process_mouse_exited = false; - } - } - - if (process_mouse_exited) - ProcessMouseExited(); - return 0; -} - LRESULT WindowWin::OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param) { if (message == WM_RBUTTONUP) { if (is_right_mouse_pressed_on_caption_) { diff --git a/views/window/window_win.h b/views/window/window_win.h index 64310ba..acb001e 100644 --- a/views/window/window_win.h +++ b/views/window/window_win.h @@ -108,9 +108,6 @@ class WindowWin : public WidgetWin, virtual void OnFinalMessage(HWND window) OVERRIDE; virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info) OVERRIDE; virtual void OnInitMenu(HMENU menu) OVERRIDE; - virtual LRESULT OnMouseLeave(UINT message, - WPARAM w_param, - LPARAM l_param) OVERRIDE; virtual LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param) OVERRIDE; |