| Index: ui/views/controls/menu/menu_controller.h
|
| diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
|
| index 5e34416f83883b0231aeac7b1b2831a04f8e34f3..7c927fad14de9ab87de6c50c188d3240d1ebdedb 100644
|
| --- a/ui/views/controls/menu/menu_controller.h
|
| +++ b/ui/views/controls/menu/menu_controller.h
|
| @@ -25,6 +25,14 @@
|
| #include "ui/views/controls/menu/menu_delegate.h"
|
| #include "ui/views/widget/widget_observer.h"
|
|
|
| +#if defined(USE_AURA)
|
| +namespace aura {
|
| +namespace client {
|
| +class ActivationChangeObserver;
|
| +} // namespace client
|
| +} // namespace aura
|
| +#endif // defined(USE_AURA)
|
| +
|
| namespace ui {
|
| class OSExchangeData;
|
| class ScopedEventDispatcher;
|
| @@ -318,10 +326,8 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
|
|
|
| ~MenuController() override;
|
|
|
| - // Runs the platform specific bits of the message loop. If |nested_menu| is
|
| - // true we're being asked to run a menu from within a menu (eg a context
|
| - // menu).
|
| - void RunMessageLoop(bool nested_menu);
|
| + // Runs the platform specific bits of the message loop.
|
| + void RunMessageLoop();
|
|
|
| // Invokes AcceleratorPressed() on the hot tracked view if there is one.
|
| // Returns true if AcceleratorPressed() was invoked.
|
| @@ -700,6 +706,8 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
|
| std::unique_ptr<MenuMessageLoop> message_loop_;
|
|
|
| #if defined(USE_AURA)
|
| + std::unique_ptr<aura::client::ActivationChangeObserver>
|
| + activation_change_observer_;
|
| std::unique_ptr<MenuKeyEventHandler> key_event_handler_;
|
| #endif
|
|
|
|
|