| 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_helper.h" | 5 #include "ui/aura/test/aura_test_helper.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
| 10 #include "ui/aura/client/default_activation_client.h" | |
| 11 #include "ui/aura/client/default_capture_client.h" | 10 #include "ui/aura/client/default_capture_client.h" |
| 12 #include "ui/aura/client/focus_client.h" | 11 #include "ui/aura/client/focus_client.h" |
| 13 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
| 14 #include "ui/aura/input_state_lookup.h" | 13 #include "ui/aura/input_state_lookup.h" |
| 15 #include "ui/aura/test/env_test_helper.h" | 14 #include "ui/aura/test/env_test_helper.h" |
| 16 #include "ui/aura/test/test_focus_client.h" | 15 #include "ui/aura/test/test_focus_client.h" |
| 17 #include "ui/aura/test/test_screen.h" | 16 #include "ui/aura/test/test_screen.h" |
| 18 #include "ui/aura/test/test_window_tree_client.h" | 17 #include "ui/aura/test/test_window_tree_client.h" |
| 19 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
| 20 #include "ui/base/ime/dummy_input_method.h" | 19 #include "ui/base/ime/dummy_input_method.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 | 63 |
| 65 ui::InitializeInputMethodForTesting(); | 64 ui::InitializeInputMethodForTesting(); |
| 66 | 65 |
| 67 test_screen_.reset(TestScreen::Create()); | 66 test_screen_.reset(TestScreen::Create()); |
| 68 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); | 67 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get()); |
| 69 host_.reset(test_screen_->CreateHostForPrimaryDisplay()); | 68 host_.reset(test_screen_->CreateHostForPrimaryDisplay()); |
| 70 | 69 |
| 71 focus_client_.reset(new TestFocusClient); | 70 focus_client_.reset(new TestFocusClient); |
| 72 client::SetFocusClient(root_window(), focus_client_.get()); | 71 client::SetFocusClient(root_window(), focus_client_.get()); |
| 73 stacking_client_.reset(new TestWindowTreeClient(root_window())); | 72 stacking_client_.reset(new TestWindowTreeClient(root_window())); |
| 74 activation_client_.reset( | |
| 75 new client::DefaultActivationClient(root_window())); | |
| 76 capture_client_.reset(new client::DefaultCaptureClient(root_window())); | 73 capture_client_.reset(new client::DefaultCaptureClient(root_window())); |
| 77 test_input_method_.reset(new ui::DummyInputMethod); | 74 test_input_method_.reset(new ui::DummyInputMethod); |
| 78 root_window()->SetProperty( | 75 root_window()->SetProperty( |
| 79 client::kRootWindowInputMethodKey, | 76 client::kRootWindowInputMethodKey, |
| 80 test_input_method_.get()); | 77 test_input_method_.get()); |
| 81 | 78 |
| 82 root_window()->Show(); | 79 root_window()->Show(); |
| 83 // Ensure width != height so tests won't confuse them. | 80 // Ensure width != height so tests won't confuse them. |
| 84 host()->SetBounds(gfx::Rect(800, 600)); | 81 host()->SetBounds(gfx::Rect(800, 600)); |
| 85 } | 82 } |
| 86 | 83 |
| 87 void AuraTestHelper::TearDown() { | 84 void AuraTestHelper::TearDown() { |
| 88 teardown_called_ = true; | 85 teardown_called_ = true; |
| 89 test_input_method_.reset(); | 86 test_input_method_.reset(); |
| 90 stacking_client_.reset(); | 87 stacking_client_.reset(); |
| 91 activation_client_.reset(); | |
| 92 capture_client_.reset(); | 88 capture_client_.reset(); |
| 93 focus_client_.reset(); | 89 focus_client_.reset(); |
| 94 client::SetFocusClient(root_window(), NULL); | 90 client::SetFocusClient(root_window(), NULL); |
| 95 host_.reset(); | 91 host_.reset(); |
| 96 ui::GestureRecognizer::Reset(); | 92 ui::GestureRecognizer::Reset(); |
| 97 test_screen_.reset(); | 93 test_screen_.reset(); |
| 98 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); | 94 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL); |
| 99 | 95 |
| 100 #if defined(USE_X11) | 96 #if defined(USE_X11) |
| 101 ui::ResetXCursorCache(); | 97 ui::ResetXCursorCache(); |
| 102 #endif | 98 #endif |
| 103 | 99 |
| 104 ui::ShutdownInputMethodForTesting(); | 100 ui::ShutdownInputMethodForTesting(); |
| 105 | 101 |
| 106 Env::DeleteInstance(); | 102 Env::DeleteInstance(); |
| 107 } | 103 } |
| 108 | 104 |
| 109 void AuraTestHelper::RunAllPendingInMessageLoop() { | 105 void AuraTestHelper::RunAllPendingInMessageLoop() { |
| 110 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 106 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
| 111 // use run_loop.QuitClosure(). | 107 // use run_loop.QuitClosure(). |
| 112 base::RunLoop run_loop; | 108 base::RunLoop run_loop; |
| 113 run_loop.RunUntilIdle(); | 109 run_loop.RunUntilIdle(); |
| 114 } | 110 } |
| 115 | 111 |
| 116 } // namespace test | 112 } // namespace test |
| 117 } // namespace aura | 113 } // namespace aura |
| OLD | NEW |