| Index: ui/wm/core/nested_accelerator_controller.h
|
| diff --git a/ui/wm/core/nested_accelerator_controller.h b/ui/wm/core/nested_accelerator_controller.h
|
| index 2adfcbc54adbc2a745e0dad7d6d69ae491300aca..2826d72ea2751f51a6fc14cb28365ef4d6ba247b 100644
|
| --- a/ui/wm/core/nested_accelerator_controller.h
|
| +++ b/ui/wm/core/nested_accelerator_controller.h
|
| @@ -26,12 +26,16 @@ class WM_EXPORT NestedAcceleratorController
|
| virtual ~NestedAcceleratorController();
|
|
|
| // aura::client::DispatcherClient:
|
| - virtual void RunWithDispatcher(
|
| - base::MessagePumpDispatcher* dispatcher) OVERRIDE;
|
| - virtual void QuitNestedMessageLoop() OVERRIDE;
|
| + virtual void PrepareNestedLoopClosures(
|
| + base::MessagePumpDispatcher* dispatcher,
|
| + base::Closure* run_closure,
|
| + base::Closure* quit_closure) OVERRIDE;
|
|
|
| private:
|
| - base::Closure quit_closure_;
|
| + void RunNestedMessageLoop(scoped_ptr<base::RunLoop> run_loop,
|
| + scoped_ptr<NestedAcceleratorDispatcher> dispatcher);
|
| + void QuitNestedMessageLoop(const base::Closure& quit_runloop);
|
| +
|
| scoped_ptr<NestedAcceleratorDispatcher> accelerator_dispatcher_;
|
| scoped_ptr<NestedAcceleratorDelegate> dispatcher_delegate_;
|
|
|
|
|