| OLD | NEW |
| 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 "ui/aura/event_filter.h" | 5 #include "ui/aura/event_filter.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "ui/aura/focus_manager.h" | 9 #include "ui/aura/focus_manager.h" |
| 10 #include "ui/aura/root_window.h" | 10 #include "ui/aura/root_window.h" |
| 11 #include "ui/aura/test/aura_test_base.h" | 11 #include "ui/aura/test/aura_test_base.h" |
| 12 #include "ui/aura/test/event_generator.h" | 12 #include "ui/aura/test/event_generator.h" |
| 13 #include "ui/aura/test/test_event_filter.h" | 13 #include "ui/aura/test/test_event_filter.h" |
| 14 #include "ui/aura/test/test_window_delegate.h" | 14 #include "ui/aura/test/test_window_delegate.h" |
| 15 #include "ui/base/event.h" | 15 #include "ui/base/events/event.h" |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 // Windows headers define macros for these function names which screw with us. | 18 // Windows headers define macros for these function names which screw with us. |
| 19 #if defined(CreateWindow) | 19 #if defined(CreateWindow) |
| 20 #undef CreateWindow | 20 #undef CreateWindow |
| 21 #endif | 21 #endif |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace aura { | 24 namespace aura { |
| 25 | 25 |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 generator.PressKey(ui::VKEY_A, 0); | 257 generator.PressKey(ui::VKEY_A, 0); |
| 258 generator.PressLeftButton(); | 258 generator.PressLeftButton(); |
| 259 | 259 |
| 260 EXPECT_EQ(1, w1_filter->key_event_count()); | 260 EXPECT_EQ(1, w1_filter->key_event_count()); |
| 261 EXPECT_EQ(0, d11->key_event_count()); | 261 EXPECT_EQ(0, d11->key_event_count()); |
| 262 EXPECT_EQ(1, w1_filter->mouse_event_count()); | 262 EXPECT_EQ(1, w1_filter->mouse_event_count()); |
| 263 EXPECT_EQ(0, d11->mouse_event_count()); | 263 EXPECT_EQ(0, d11->mouse_event_count()); |
| 264 } | 264 } |
| 265 | 265 |
| 266 } // namespace aura | 266 } // namespace aura |
| OLD | NEW |