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

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

Issue 267723008: Retires ui::TranslatedKeyEvent and replaces it with KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed AcceleratorControllerTest.MAYBE_ProcessOnce more. Created 6 years, 7 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 | « no previous file | ash/sticky_keys/sticky_keys_controller.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 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { 584 TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) {
585 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE); 585 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
586 TestTarget target; 586 TestTarget target;
587 GetController()->Register(accelerator_a, &target); 587 GetController()->Register(accelerator_a, &target);
588 588
589 // The accelerator is processed only once. 589 // The accelerator is processed only once.
590 ui::EventProcessor* dispatcher = 590 ui::EventProcessor* dispatcher =
591 Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); 591 Shell::GetPrimaryRootWindow()->GetHost()->event_processor();
592 #if defined(OS_WIN) 592 #if defined(OS_WIN)
593 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; 593 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
594 ui::TranslatedKeyEvent key_event1(msg1, false); 594 ui::KeyEvent key_event1(msg1, false);
595 key_event1.SetTranslated(true);
595 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 596 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
596 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 597 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
597 598
598 MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; 599 MSG msg2 = { NULL, WM_CHAR, L'A', 0 };
599 ui::TranslatedKeyEvent key_event2(msg2, true); 600 ui::KeyEvent key_event2(msg2, true);
601 key_event2.SetTranslated(true);
600 details = dispatcher->OnEventFromSource(&key_event2); 602 details = dispatcher->OnEventFromSource(&key_event2);
601 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 603 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
602 604
603 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; 605 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
604 ui::TranslatedKeyEvent key_event3(msg3, false); 606 ui::KeyEvent key_event3(msg3, false);
607 key_event3.SetTranslated(true);
605 details = dispatcher->OnEventFromSource(&key_event3); 608 details = dispatcher->OnEventFromSource(&key_event3);
606 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 609 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
607 #elif defined(USE_X11) 610 #elif defined(USE_X11)
608 ui::ScopedXI2Event key_event; 611 ui::ScopedXI2Event key_event;
609 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); 612 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
610 ui::TranslatedKeyEvent key_event1(key_event, false); 613 ui::KeyEvent key_event1(key_event, false);
614 key_event1.SetTranslated(true);
611 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 615 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
612 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 616 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
613 617
614 ui::TranslatedKeyEvent key_event2(key_event, true); 618 ui::KeyEvent key_event2(key_event, true);
619 key_event2.SetTranslated(true);
615 details = dispatcher->OnEventFromSource(&key_event2); 620 details = dispatcher->OnEventFromSource(&key_event2);
616 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 621 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
617 622
618 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); 623 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0);
619 ui::TranslatedKeyEvent key_event3(key_event, false); 624 ui::KeyEvent key_event3(key_event, false);
625 key_event3.SetTranslated(true);
620 details = dispatcher->OnEventFromSource(&key_event3); 626 details = dispatcher->OnEventFromSource(&key_event3);
621 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 627 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
622 #endif 628 #endif
623 EXPECT_EQ(1, target.accelerator_pressed_count()); 629 EXPECT_EQ(1, target.accelerator_pressed_count());
624 } 630 }
625 #endif 631 #endif
626 632
627 TEST_F(AcceleratorControllerTest, GlobalAccelerators) { 633 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
628 // CycleBackward 634 // CycleBackward
629 EXPECT_TRUE(ProcessWithContext( 635 EXPECT_TRUE(ProcessWithContext(
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
1205 // Don't alert if we have a minimized window either. 1211 // Don't alert if we have a minimized window either.
1206 GetController()->PerformAction(WINDOW_MINIMIZE, dummy); 1212 GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
1207 for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) { 1213 for (size_t i = 0; i < kActionsNeedingWindowLength; ++i) {
1208 delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE); 1214 delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
1209 GetController()->PerformAction(kActionsNeedingWindow[i], dummy); 1215 GetController()->PerformAction(kActionsNeedingWindow[i], dummy);
1210 EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED); 1216 EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
1211 } 1217 }
1212 } 1218 }
1213 1219
1214 } // namespace ash 1220 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/sticky_keys/sticky_keys_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698