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

Side by Side Diff: ash/sticky_keys/sticky_keys_overlay_unittest.cc

Issue 184903003: Window ownership -> WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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/sticky_keys/sticky_keys_controller.cc ('k') | ash/sticky_keys/sticky_keys_unittest.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 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/sticky_keys/sticky_keys_overlay.h" 5 #include "ash/sticky_keys/sticky_keys_overlay.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/sticky_keys/sticky_keys_controller.h" 8 #include "ash/sticky_keys/sticky_keys_controller.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 24 matching lines...) Expand all
35 SendKeyEvent(ui::ET_KEY_PRESSED, code); 35 SendKeyEvent(ui::ET_KEY_PRESSED, code);
36 SendKeyEvent(ui::ET_KEY_RELEASED, code); 36 SendKeyEvent(ui::ET_KEY_RELEASED, code);
37 } 37 }
38 38
39 void SendKeyEvent(ui::EventType type, ui::KeyboardCode code) { 39 void SendKeyEvent(ui::EventType type, ui::KeyboardCode code) {
40 ui::KeyEvent event(type, code, 0, false); 40 ui::KeyEvent event(type, code, 0, false);
41 ui::Event::DispatcherApi dispatcher(&event); 41 ui::Event::DispatcherApi dispatcher(&event);
42 dispatcher.set_target(Shell::GetInstance()->GetPrimaryRootWindow()); 42 dispatcher.set_target(Shell::GetInstance()->GetPrimaryRootWindow());
43 43
44 ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()-> 44 ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()->
45 GetDispatcher()->OnEventFromSource(&event); 45 GetHost()->dispatcher()->OnEventFromSource(&event);
46 CHECK(!details.dispatcher_destroyed); 46 CHECK(!details.dispatcher_destroyed);
47 } 47 }
48 48
49 StickyKeysController* controller_; 49 StickyKeysController* controller_;
50 StickyKeysOverlay* overlay_; 50 StickyKeysOverlay* overlay_;
51 }; 51 };
52 52
53 TEST_F(StickyKeysOverlayTest, OverlayVisibility) { 53 TEST_F(StickyKeysOverlayTest, OverlayVisibility) {
54 StickyKeysOverlay overlay; 54 StickyKeysOverlay overlay;
55 EXPECT_FALSE(overlay.is_visible()); 55 EXPECT_FALSE(overlay.is_visible());
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 EXPECT_FALSE(overlay_->is_visible()); 197 EXPECT_FALSE(overlay_->is_visible());
198 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, 198 EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
199 overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN)); 199 overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
200 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, 200 EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
201 overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN)); 201 overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
202 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, 202 EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
203 overlay_->GetModifierKeyState(ui::EF_ALT_DOWN)); 203 overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
204 } 204 }
205 205
206 } // namespace ash 206 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.cc ('k') | ash/sticky_keys/sticky_keys_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698