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/wm/core/compound_event_filter.h" | 5 #include "ui/wm/core/compound_event_filter.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "ui/aura/client/cursor_client.h" | 9 #include "ui/aura/client/cursor_client.h" |
10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
11 #include "ui/aura/test/aura_test_base.h" | 11 #include "ui/aura/test/aura_test_base.h" |
12 #include "ui/aura/test/test_cursor_client.h" | 12 #include "ui/aura/test/test_cursor_client.h" |
13 #include "ui/aura/test/test_windows.h" | 13 #include "ui/aura/test/test_windows.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 #include "ui/aura/window_event_dispatcher.h" | 15 #include "ui/aura/window_event_dispatcher.h" |
16 #include "ui/events/event.h" | 16 #include "ui/events/event.h" |
17 #include "ui/events/event_utils.h" | 17 #include "ui/events/event_utils.h" |
18 #include "ui/events/test/event_generator.h" | 18 #include "ui/events/test/event_generator.h" |
19 #include "ui/wm/core/default_activation_client.h" | 19 #include "ui/wm/core/default_activation_client.h" |
20 #include "ui/wm/public/activation_client.h" | 20 #include "ui/wm/public/activation_client.h" |
21 | 21 |
22 namespace { | 22 namespace { |
23 | 23 |
24 #if defined(OS_CHROMEOS) || defined(OS_WIN) | 24 #if defined(OS_CHROMEOS) || defined(OS_WIN) |
25 base::TimeDelta GetTime() { | 25 base::TimeTicks GetTime() { |
26 return ui::EventTimeForNow(); | 26 return ui::EventTimeForNow(); |
27 } | 27 } |
28 #endif // defined(OS_CHROMEOS) || defined(OS_WIN) | 28 #endif // defined(OS_CHROMEOS) || defined(OS_WIN) |
29 | 29 |
30 } | 30 } |
31 | 31 |
32 namespace wm { | 32 namespace wm { |
33 | 33 |
34 namespace { | 34 namespace { |
35 | 35 |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 | 242 |
243 mouse0.set_flags(mouse0.flags() & ~ui::EF_FROM_TOUCH); | 243 mouse0.set_flags(mouse0.flags() & ~ui::EF_FROM_TOUCH); |
244 DispatchEventUsingWindowDispatcher(&mouse0); | 244 DispatchEventUsingWindowDispatcher(&mouse0); |
245 EXPECT_TRUE(cursor_client.IsMouseEventsEnabled()); | 245 EXPECT_TRUE(cursor_client.IsMouseEventsEnabled()); |
246 | 246 |
247 aura::Env::GetInstance()->RemovePreTargetHandler(compound_filter.get()); | 247 aura::Env::GetInstance()->RemovePreTargetHandler(compound_filter.get()); |
248 } | 248 } |
249 #endif | 249 #endif |
250 | 250 |
251 } // namespace wm | 251 } // namespace wm |
OLD | NEW |