| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/nested_dispatcher_controller.h" | 5 #include "ash/accelerators/nested_dispatcher_controller.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_dispatcher.h" | 7 #include "ash/accelerators/accelerator_dispatcher.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 | 12 |
| 13 NestedDispatcherController::NestedDispatcherController() { | 13 NestedDispatcherController::NestedDispatcherController() { |
| 14 } | 14 } |
| 15 | 15 |
| 16 NestedDispatcherController::~NestedDispatcherController() { | 16 NestedDispatcherController::~NestedDispatcherController() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 void NestedDispatcherController::RunWithDispatcher( | 19 void NestedDispatcherController::RunWithDispatcher( |
| 20 base::MessagePumpDispatcher* nested_dispatcher, | 20 base::MessagePumpDispatcher* nested_dispatcher, |
| 21 aura::Window* associated_window, | 21 aura::Window* associated_window) { |
| 22 bool nestable_tasks_allowed) { | |
| 23 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | 22 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); |
| 24 bool did_allow_task_nesting = loop->NestableTasksAllowed(); | 23 base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop); |
| 25 loop->SetNestableTasksAllowed(nestable_tasks_allowed); | |
| 26 | 24 |
| 27 AcceleratorDispatcher dispatcher(nested_dispatcher, associated_window); | 25 AcceleratorDispatcher dispatcher(nested_dispatcher, associated_window); |
| 28 | 26 |
| 29 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 27 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
| 30 // use run_loop.QuitClosure(). | 28 // use run_loop.QuitClosure(). |
| 31 base::RunLoop run_loop(&dispatcher); | 29 base::RunLoop run_loop(&dispatcher); |
| 32 run_loop.Run(); | 30 run_loop.Run(); |
| 33 loop->SetNestableTasksAllowed(did_allow_task_nesting); | |
| 34 } | 31 } |
| 35 | 32 |
| 36 } // namespace ash | 33 } // namespace ash |
| OLD | NEW |