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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

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/widget/desktop_aura/desktop_root_window_host_win.cc
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index e8df249ae53384ef48e87f5f248ac7b940f5d461..388b40d94136e97160c16c4c2397a4d1ec1cb27b 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -10,6 +10,7 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/client/focus_client.h"
+#include "ui/aura/client/scoped_tooltip_disabler.h"
#include "ui/aura/root_window.h"
#include "ui/aura/window_property.h"
#include "ui/base/cursor/cursor_loader_win.h"
@@ -917,6 +918,15 @@ void DesktopRootWindowHostWin::HandleTooltipMouseMove(UINT message,
// TODO(sky): remove from HWNDMessageHandler once non-aura path nuked.
}
+void DesktopRootWindowHostWin::HandleMenuLoop(bool in_menu_loop) {
+ if (in_menu_loop) {
+ tooltip_disabler_.reset(
+ new aura::client::ScopedTooltipDisabler(root_window_->window()));
+ } else {
+ tooltip_disabler_.reset();
+ }
+}
+
bool DesktopRootWindowHostWin::PreHandleMSG(UINT message,
WPARAM w_param,
LPARAM l_param,

Powered by Google App Engine
This is Rietveld 408576698