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/auto_reset.h" |
9 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
10 | 11 |
11 namespace ash { | 12 namespace ash { |
12 | 13 |
13 NestedDispatcherController::NestedDispatcherController() { | 14 NestedDispatcherController::NestedDispatcherController() { |
14 } | 15 } |
15 | 16 |
16 NestedDispatcherController::~NestedDispatcherController() { | 17 NestedDispatcherController::~NestedDispatcherController() { |
17 } | 18 } |
18 | 19 |
19 void NestedDispatcherController::RunWithDispatcher( | 20 void NestedDispatcherController::RunWithDispatcher( |
20 base::MessagePumpDispatcher* nested_dispatcher, | 21 base::MessagePumpDispatcher* nested_dispatcher, |
21 aura::Window* associated_window) { | 22 aura::Window* associated_window) { |
22 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); | 23 base::MessageLoopForUI* loop = base::MessageLoopForUI::current(); |
23 base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop); | 24 base::MessageLoopForUI::ScopedNestableTaskAllower allow_nested(loop); |
24 | 25 |
25 AcceleratorDispatcher dispatcher(nested_dispatcher, associated_window); | 26 AcceleratorDispatcher dispatcher(nested_dispatcher, associated_window); |
26 | 27 |
27 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 28 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
28 // use run_loop.QuitClosure(). | 29 // use run_loop.QuitClosure(). |
29 base::RunLoop run_loop(&dispatcher); | 30 base::RunLoop run_loop(&dispatcher); |
| 31 base::AutoReset<base::Closure> reset_closure(&quit_closure_, |
| 32 run_loop.QuitClosure()); |
30 run_loop.Run(); | 33 run_loop.Run(); |
31 } | 34 } |
32 | 35 |
| 36 void NestedDispatcherController::QuitNestedMessageLoop() { |
| 37 CHECK(!quit_closure_.is_null()); |
| 38 quit_closure_.Run(); |
| 39 } |
| 40 |
33 } // namespace ash | 41 } // namespace ash |
OLD | NEW |