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

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

Issue 1209663002: Use EventHandler for IME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/magnifier_key_scroller.h" 5 #include "ash/accelerators/magnifier_key_scroller.h"
6 6
7 #include "ash/magnifier/magnification_controller.h" 7 #include "ash/magnifier/magnification_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ui::test::EventGenerator& generator = GetEventGenerator(); 56 ui::test::EventGenerator& generator = GetEventGenerator();
57 57
58 // Click and Release generates the press event upon release. 58 // Click and Release generates the press event upon release.
59 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 59 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
60 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString()); 60 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString());
61 EXPECT_FALSE(delegate.event()); 61 EXPECT_FALSE(delegate.event());
62 62
63 generator.ReleaseKey(ui::VKEY_DOWN, 0); 63 generator.ReleaseKey(ui::VKEY_DOWN, 0);
64 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString()); 64 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString());
65 RunAllPendingInMessageLoop(); 65 RunAllPendingInMessageLoop();
66 EXPECT_TRUE(delegate.event()); 66 ASSERT_TRUE(delegate.event());
67 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); 67 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
68 delegate.reset(); 68 delegate.reset();
69 69
70 // Click and hold scrolls the magnifier screen. 70 // Click and hold scrolls the magnifier screen.
71 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 71 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
72 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString()); 72 EXPECT_EQ("200,150", controller->GetWindowPosition().ToString());
73 EXPECT_FALSE(delegate.event()); 73 EXPECT_FALSE(delegate.event());
74 74
75 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 75 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
76 EXPECT_EQ("200,300", controller->GetWindowPosition().ToString()); 76 EXPECT_EQ("200,300", controller->GetWindowPosition().ToString());
77 EXPECT_FALSE(delegate.event()); 77 EXPECT_FALSE(delegate.event());
78 78
79 generator.ReleaseKey(ui::VKEY_DOWN, 0); 79 generator.ReleaseKey(ui::VKEY_DOWN, 0);
80 EXPECT_EQ("200,300", controller->GetWindowPosition().ToString()); 80 EXPECT_EQ("200,300", controller->GetWindowPosition().ToString());
81 EXPECT_FALSE(delegate.event()); 81 EXPECT_FALSE(delegate.event());
82 82
83 // Events are passed normally when the magnifier is off. 83 // Events are passed normally when the magnifier is off.
84 controller->SetEnabled(false); 84 controller->SetEnabled(false);
85 85
86 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 86 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
87 EXPECT_TRUE(delegate.event()); 87 ASSERT_TRUE(delegate.event());
88 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); 88 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
89 delegate.reset(); 89 delegate.reset();
90 90
91 generator.ReleaseKey(ui::VKEY_DOWN, 0); 91 generator.ReleaseKey(ui::VKEY_DOWN, 0);
92 EXPECT_TRUE(delegate.event()); 92 ASSERT_TRUE(delegate.event());
93 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type()); 93 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type());
94 delegate.reset(); 94 delegate.reset();
95 95
96 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 96 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
97 EXPECT_TRUE(delegate.event()); 97 ASSERT_TRUE(delegate.event());
98 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); 98 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
99 delegate.reset(); 99 delegate.reset();
100 100
101 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); 101 generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);
102 EXPECT_TRUE(delegate.event()); 102 ASSERT_TRUE(delegate.event());
103 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); 103 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type());
104 delegate.reset(); 104 delegate.reset();
105 105
106 generator.ReleaseKey(ui::VKEY_DOWN, 0); 106 generator.ReleaseKey(ui::VKEY_DOWN, 0);
107 EXPECT_TRUE(delegate.event()); 107 ASSERT_TRUE(delegate.event());
108 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type()); 108 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type());
109 delegate.reset(); 109 delegate.reset();
110 } 110 }
111 111
112 } // namespace ash 112 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698