| 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 a28c4cc2bcc4272218e9de0065f1deb704795b9f..d499710e46c208877876d10884c3fa8116d5f4ba 100644
|
| --- a/ui/views/controls/menu/menu_controller.h
|
| +++ b/ui/views/controls/menu/menu_controller.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_constants.h"
|
| @@ -539,6 +540,11 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
|
| // Terminates the current nested message-loop.
|
| void TerminateNestedMessageLoop();
|
|
|
| + // Performs the teardown of menus launched with |async_run_|. This will
|
| + // notifiy the |delegate_|. If |exit_type_| is EXIT_ALL all nested
|
| + // asynchronous runs will be exited.
|
| + void ExitAsyncRun();
|
| +
|
| // Performs the teardown of the menu launched by Run(). The selected item is
|
| // returned.
|
| MenuItemView* ExitMenuRun();
|
| @@ -686,6 +692,8 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
|
|
|
| scoped_ptr<MenuMessageLoop> message_loop_;
|
|
|
| + base::WeakPtrFactory<MenuController> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MenuController);
|
| };
|
|
|
|
|