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/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
6 | 6 |
7 #include "ui/aura/client/window_tree_client.h" | 7 #include "ui/aura/client/window_tree_client.h" |
8 #include "ui/aura/test/aura_test_helper.h" | 8 #include "ui/aura/test/aura_test_helper.h" |
9 #include "ui/aura/test/test_window_delegate.h" | 9 #include "ui/aura/test/test_window_delegate.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/aura/window_event_dispatcher.h" | |
12 #include "ui/base/ime/input_method_initializer.h" | 11 #include "ui/base/ime/input_method_initializer.h" |
13 #include "ui/compositor/test/context_factories_for_test.h" | 12 #include "ui/compositor/test/context_factories_for_test.h" |
14 #include "ui/events/event_dispatcher.h" | 13 #include "ui/events/event_dispatcher.h" |
| 14 #include "ui/events/event_processor.h" |
15 #include "ui/events/gestures/gesture_configuration.h" | 15 #include "ui/events/gestures/gesture_configuration.h" |
16 | 16 |
17 namespace aura { | 17 namespace aura { |
18 namespace test { | 18 namespace test { |
19 | 19 |
20 AuraTestBase::AuraTestBase() | 20 AuraTestBase::AuraTestBase() |
21 : setup_called_(false), | 21 : setup_called_(false), |
22 teardown_called_(false) { | 22 teardown_called_(false) { |
23 } | 23 } |
24 | 24 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 | 106 |
107 void AuraTestBase::RunAllPendingInMessageLoop() { | 107 void AuraTestBase::RunAllPendingInMessageLoop() { |
108 helper_->RunAllPendingInMessageLoop(); | 108 helper_->RunAllPendingInMessageLoop(); |
109 } | 109 } |
110 | 110 |
111 void AuraTestBase::ParentWindow(Window* window) { | 111 void AuraTestBase::ParentWindow(Window* window) { |
112 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); | 112 client::ParentWindowWithContext(window, root_window(), gfx::Rect()); |
113 } | 113 } |
114 | 114 |
115 bool AuraTestBase::DispatchEventUsingWindowDispatcher(ui::Event* event) { | 115 bool AuraTestBase::DispatchEventUsingWindowDispatcher(ui::Event* event) { |
116 ui::EventDispatchDetails details = dispatcher()->OnEventFromSource(event); | 116 ui::EventDispatchDetails details = |
| 117 event_processor()->OnEventFromSource(event); |
117 CHECK(!details.dispatcher_destroyed); | 118 CHECK(!details.dispatcher_destroyed); |
118 return event->handled(); | 119 return event->handled(); |
119 } | 120 } |
120 | 121 |
121 } // namespace test | 122 } // namespace test |
122 } // namespace aura | 123 } // namespace aura |
OLD | NEW |