Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Unified Diff: ui/views/win/hwnd_message_handler.h

Issue 109403008: Disables showing tooltips while a system menu is showing on windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move resetting Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/win/hwnd_message_handler.h
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index e02ef56b517a25812c216c3dc22222f9af665fc5..802b70290c7318531606c3e3f3087244a15a79ab 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -342,6 +342,8 @@ class VIEWS_EXPORT HWNDMessageHandler :
MSG_WM_CREATE(OnCreate)
MSG_WM_DESTROY(OnDestroy)
MSG_WM_DISPLAYCHANGE(OnDisplayChange)
+ MSG_WM_ENTERMENULOOP(OnEnterMenuLoop)
+ MSG_WM_EXITMENULOOP(OnExitMenuLoop)
MSG_WM_ENTERSIZEMOVE(OnEnterSizeMove)
MSG_WM_ERASEBKGND(OnEraseBkgnd)
MSG_WM_EXITSIZEMOVE(OnExitSizeMove)
@@ -383,8 +385,10 @@ class VIEWS_EXPORT HWNDMessageHandler :
void OnDestroy();
void OnDisplayChange(UINT bits_per_pixel, const CSize& screen_size);
LRESULT OnDwmCompositionChanged(UINT msg, WPARAM w_param, LPARAM l_param);
+ void OnEnterMenuLoop(BOOL from_track_popup_menu);
void OnEnterSizeMove();
LRESULT OnEraseBkgnd(HDC dc);
+ void OnExitMenuLoop(BOOL is_shortcut_menu);
void OnExitSizeMove();
void OnGetMinMaxInfo(MINMAXINFO* minmax_info);
LRESULT OnGetObject(UINT message, WPARAM w_param, LPARAM l_param);
@@ -521,6 +525,9 @@ class VIEWS_EXPORT HWNDMessageHandler :
// Copy of custom window region specified via SetRegion(), if any.
base::win::ScopedRegion custom_window_region_;
+ // If > 0 indicates a menu is running (we're showing a native menu).
+ int menu_depth_;
+
// A factory used to lookup appbar autohide edges.
base::WeakPtrFactory<HWNDMessageHandler> autohide_factory_;

Powered by Google App Engine
This is Rietveld 408576698