Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: ash/accelerators/nested_dispatcher_controller_unittest.cc

Issue 10155015: Process all global shortcuts for Ash after InputMethodEventFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, address comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_table.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, false, false, false);
154 accelerator.set_type(ui::ET_KEY_RELEASED); 154 accelerator.set_type(ui::ET_KEY_RELEASED);
155 // TODO(yusukes): Add a test for a ui::ET_TRANSLATED_KEY_RELEASE accelerator.
156 TestTarget target; 155 TestTarget target;
157 Shell::GetInstance()->accelerator_controller()->Register(accelerator, 156 Shell::GetInstance()->accelerator_controller()->Register(accelerator,
158 &target); 157 &target);
159 158
160 DispatchKeyReleaseA(); 159 DispatchKeyReleaseA();
161 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( 160 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
162 &inner_dispatcher, 161 &inner_dispatcher,
163 root_window, 162 root_window,
164 true /* nestable_tasks_allowed */); 163 true /* nestable_tasks_allowed */);
165 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); 164 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
166 EXPECT_EQ(1, target.accelerator_pressed_count()); 165 EXPECT_EQ(1, target.accelerator_pressed_count());
167 } 166 }
168 167
169 } // namespace test 168 } // namespace test
170 } // namespace ash 169 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_table.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698