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

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

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 years, 6 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
« no previous file with comments | « no previous file | ash/display/display_controller.h » ('j') | ash/display/display_controller.cc » ('J')
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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE); 772 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
773 TestTarget target; 773 TestTarget target;
774 GetController()->Register(accelerator_a, &target); 774 GetController()->Register(accelerator_a, &target);
775 775
776 // The accelerator is processed only once. 776 // The accelerator is processed only once.
777 ui::EventProcessor* dispatcher = 777 ui::EventProcessor* dispatcher =
778 Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); 778 Shell::GetPrimaryRootWindow()->GetHost()->event_processor();
779 #if defined(OS_WIN) 779 #if defined(OS_WIN)
780 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; 780 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
781 ui::KeyEvent key_event1(msg1); 781 ui::KeyEvent key_event1(msg1);
782 key_event1.SetTranslated(true);
783 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 782 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
784 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 783 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
785 784
786 MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; 785 MSG msg2 = { NULL, WM_CHAR, L'A', 0 };
787 ui::KeyEvent key_event2(msg2); 786 ui::KeyEvent key_event2(msg2);
788 key_event2.SetTranslated(true);
789 details = dispatcher->OnEventFromSource(&key_event2); 787 details = dispatcher->OnEventFromSource(&key_event2);
790 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 788 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
791 789
792 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; 790 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
793 ui::KeyEvent key_event3(msg3); 791 ui::KeyEvent key_event3(msg3);
794 key_event3.SetTranslated(true);
795 details = dispatcher->OnEventFromSource(&key_event3); 792 details = dispatcher->OnEventFromSource(&key_event3);
796 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 793 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
797 #elif defined(USE_X11) 794 #elif defined(USE_X11)
798 ui::ScopedXI2Event key_event; 795 ui::ScopedXI2Event key_event;
799 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); 796 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
800 ui::KeyEvent key_event1(key_event); 797 ui::KeyEvent key_event1(key_event);
801 key_event1.SetTranslated(true);
802 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 798 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
803 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 799 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
804 800
805 ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE); 801 ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE);
806 key_event2.SetTranslated(true);
807 details = dispatcher->OnEventFromSource(&key_event2); 802 details = dispatcher->OnEventFromSource(&key_event2);
808 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 803 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
809 804
810 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); 805 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0);
811 ui::KeyEvent key_event3(key_event); 806 ui::KeyEvent key_event3(key_event);
812 key_event3.SetTranslated(true);
813 details = dispatcher->OnEventFromSource(&key_event3); 807 details = dispatcher->OnEventFromSource(&key_event3);
814 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 808 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
815 #endif 809 #endif
816 EXPECT_EQ(1, target.accelerator_pressed_count()); 810 EXPECT_EQ(1, target.accelerator_pressed_count());
817 } 811 }
818 #endif 812 #endif
819 813
820 TEST_F(AcceleratorControllerTest, GlobalAccelerators) { 814 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
821 // CycleBackward 815 // CycleBackward
822 EXPECT_TRUE(ProcessInController( 816 EXPECT_TRUE(ProcessInController(
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 wm::ActivateWindow(window.get()); 1402 wm::ActivateWindow(window.get());
1409 GetController()->PerformActionIfEnabled(WINDOW_MINIMIZE); 1403 GetController()->PerformActionIfEnabled(WINDOW_MINIMIZE);
1410 delegate->TriggerAccessibilityAlert(ui::A11Y_ALERT_NONE); 1404 delegate->TriggerAccessibilityAlert(ui::A11Y_ALERT_NONE);
1411 GetController()->PerformActionIfEnabled(kActionsNeedingWindow[i]); 1405 GetController()->PerformActionIfEnabled(kActionsNeedingWindow[i]);
1412 EXPECT_NE(delegate->GetLastAccessibilityAlert(), 1406 EXPECT_NE(delegate->GetLastAccessibilityAlert(),
1413 ui::A11Y_ALERT_WINDOW_NEEDED); 1407 ui::A11Y_ALERT_WINDOW_NEEDED);
1414 } 1408 }
1415 } 1409 }
1416 1410
1417 } // namespace ash 1411 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/display/display_controller.h » ('j') | ash/display/display_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698