| OLD | NEW |
| 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" |
| 11 #include "ui/aura/test/test_window_delegate.h" | 11 #include "ui/aura/test/test_window_delegate.h" |
| 12 #include "ui/events/test/event_generator.h" | 12 #include "ui/events/test/event_generator.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 class KeyEventDelegate : public aura::test::TestWindowDelegate { | 17 class KeyEventDelegate : public aura::test::TestWindowDelegate { |
| 18 public: | 18 public: |
| 19 KeyEventDelegate() {} | 19 KeyEventDelegate() {} |
| 20 virtual ~KeyEventDelegate() {} | 20 virtual ~KeyEventDelegate() {} |
| 21 | 21 |
| 22 // ui::EventHandler overrides: | 22 // ui::EventHandler overrides: |
| 23 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { | 23 virtual void OnKeyEvent(ui::KeyEvent* event) override { |
| 24 key_event.reset(new ui::KeyEvent( | 24 key_event.reset(new ui::KeyEvent( |
| 25 event->type(), event->key_code(), event->flags())); | 25 event->type(), event->key_code(), event->flags())); |
| 26 } | 26 } |
| 27 | 27 |
| 28 const ui::KeyEvent* event() const { return key_event.get(); } | 28 const ui::KeyEvent* event() const { return key_event.get(); } |
| 29 void reset() { key_event.reset(); } | 29 void reset() { key_event.reset(); } |
| 30 | 30 |
| 31 private: | 31 private: |
| 32 scoped_ptr<ui::KeyEvent> key_event; | 32 scoped_ptr<ui::KeyEvent> key_event; |
| 33 | 33 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); | 102 EXPECT_EQ(ui::ET_KEY_PRESSED, delegate.event()->type()); |
| 103 delegate.reset(); | 103 delegate.reset(); |
| 104 | 104 |
| 105 generator.ReleaseKey(ui::VKEY_DOWN, 0); | 105 generator.ReleaseKey(ui::VKEY_DOWN, 0); |
| 106 EXPECT_TRUE(delegate.event()); | 106 EXPECT_TRUE(delegate.event()); |
| 107 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type()); | 107 EXPECT_EQ(ui::ET_KEY_RELEASED, delegate.event()->type()); |
| 108 delegate.reset(); | 108 delegate.reset(); |
| 109 } | 109 } |
| 110 | 110 |
| 111 } // namespace ash | 111 } // namespace ash |
| OLD | NEW |