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/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
7 #include "ash/shell_delegate.h" | 7 #include "ash/shell_delegate.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 associated_window.get(), | 143 associated_window.get(), |
144 true /* nestable_tasks_allowed */); | 144 true /* nestable_tasks_allowed */); |
145 EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched()); | 145 EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched()); |
146 } | 146 } |
147 | 147 |
148 // Test that the nested dispatcher handles accelerators. | 148 // Test that the nested dispatcher handles accelerators. |
149 TEST_F(NestedDispatcherTest, AcceleratorsHandled) { | 149 TEST_F(NestedDispatcherTest, AcceleratorsHandled) { |
150 MockDispatcher inner_dispatcher; | 150 MockDispatcher inner_dispatcher; |
151 aura::RootWindow* root_window = ash::Shell::GetInstance()->GetRootWindow(); | 151 aura::RootWindow* root_window = ash::Shell::GetInstance()->GetRootWindow(); |
152 | 152 |
153 ui::Accelerator accelerator(ui::VKEY_A, false, false, false); | 153 ui::Accelerator accelerator(ui::VKEY_A, ui::EF_NONE); |
154 accelerator.set_type(ui::ET_KEY_RELEASED); | 154 accelerator.set_type(ui::ET_KEY_RELEASED); |
155 TestTarget target; | 155 TestTarget target; |
156 Shell::GetInstance()->accelerator_controller()->Register(accelerator, | 156 Shell::GetInstance()->accelerator_controller()->Register(accelerator, |
157 &target); | 157 &target); |
158 | 158 |
159 DispatchKeyReleaseA(); | 159 DispatchKeyReleaseA(); |
160 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( | 160 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( |
161 &inner_dispatcher, | 161 &inner_dispatcher, |
162 root_window, | 162 root_window, |
163 true /* nestable_tasks_allowed */); | 163 true /* nestable_tasks_allowed */); |
164 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); | 164 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); |
165 EXPECT_EQ(1, target.accelerator_pressed_count()); | 165 EXPECT_EQ(1, target.accelerator_pressed_count()); |
166 } | 166 } |
167 | 167 |
168 } // namespace test | 168 } // namespace test |
169 } // namespace ash | 169 } // namespace ash |
OLD | NEW |