| 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,
|
|
|