| Index: ash/accelerators/nested_dispatcher_controller.h
|
| diff --git a/ash/accelerators/nested_dispatcher_controller.h b/ash/accelerators/nested_dispatcher_controller.h
|
| index ebac2d2f03a6e73a6815a552ff24fc1d939d85c2..e9350f375dde641ef01ea914dd6e1a2e64948291 100644
|
| --- a/ash/accelerators/nested_dispatcher_controller.h
|
| +++ b/ash/accelerators/nested_dispatcher_controller.h
|
| @@ -26,11 +26,12 @@ class ASH_EXPORT NestedDispatcherController
|
|
|
| // aura::client::DispatcherClient:
|
| virtual void RunWithDispatcher(
|
| - base::MessagePumpDispatcher* dispatcher) OVERRIDE;
|
| - virtual void QuitNestedMessageLoop() OVERRIDE;
|
| + base::MessagePumpDispatcher* dispatcher,
|
| + base::Closure* quit_closure) OVERRIDE;
|
|
|
| private:
|
| - base::Closure quit_closure_;
|
| + void QuitNestedMessageLoop(const base::Closure& quit_runloop);
|
| +
|
| scoped_ptr<AcceleratorDispatcher> accelerator_dispatcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NestedDispatcherController);
|
|
|