| Index: ash/accelerators/nested_dispatcher_controller.cc
|
| diff --git a/ash/accelerators/nested_dispatcher_controller.cc b/ash/accelerators/nested_dispatcher_controller.cc
|
| index d30d66d23458e88d4271c7ae7476235a3a50eed5..c551e948a5f0a59fb10184e319dbb53bd1cf5436 100644
|
| --- a/ash/accelerators/nested_dispatcher_controller.cc
|
| +++ b/ash/accelerators/nested_dispatcher_controller.cc
|
| @@ -18,11 +18,9 @@ NestedDispatcherController::~NestedDispatcherController() {
|
|
|
| void NestedDispatcherController::RunWithDispatcher(
|
| base::MessagePumpDispatcher* nested_dispatcher,
|
| - aura::Window* associated_window,
|
| - bool nestable_tasks_allowed) {
|
| + aura::Window* associated_window) {
|
| base::MessageLoopForUI* loop = base::MessageLoopForUI::current();
|
| - bool did_allow_task_nesting = loop->NestableTasksAllowed();
|
| - loop->SetNestableTasksAllowed(nestable_tasks_allowed);
|
| + base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop);
|
|
|
| AcceleratorDispatcher dispatcher(nested_dispatcher, associated_window);
|
|
|
| @@ -30,7 +28,6 @@ void NestedDispatcherController::RunWithDispatcher(
|
| // use run_loop.QuitClosure().
|
| base::RunLoop run_loop(&dispatcher);
|
| run_loop.Run();
|
| - loop->SetNestableTasksAllowed(did_allow_task_nesting);
|
| }
|
|
|
| } // namespace ash
|
|
|