| Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| index 59f64f8171d92ccf0e19a158b042ad64475627dd..7352eb848b5f9c46d1005cfa22f135c318fdc2b3 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.h
|
| @@ -15,6 +15,7 @@ namespace aura {
|
| namespace client {
|
| class DragDropClient;
|
| class FocusClient;
|
| +class ScopedTooltipDisabler;
|
| }
|
| }
|
|
|
| @@ -201,6 +202,7 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
|
| virtual void HandleTooltipMouseMove(UINT message,
|
| WPARAM w_param,
|
| LPARAM l_param) OVERRIDE;
|
| + virtual void HandleMenuLoop(bool in_menu_loop) OVERRIDE;
|
| virtual bool PreHandleMSG(UINT message,
|
| WPARAM w_param,
|
| LPARAM l_param,
|
| @@ -269,6 +271,8 @@ class VIEWS_EXPORT DesktopRootWindowHostWin
|
| // State of the cursor.
|
| bool is_cursor_visible_;
|
|
|
| + scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostWin);
|
| };
|
|
|
|
|