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" | 10 #include "ui/aura/client/default_activation_client.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 activation_client_.reset( | 74 activation_client_.reset( |
75 new client::DefaultActivationClient(root_window())); | 75 new client::DefaultActivationClient(root_window())); |
76 capture_client_.reset(new client::DefaultCaptureClient(root_window())); | 76 capture_client_.reset(new client::DefaultCaptureClient(root_window())); |
77 test_input_method_.reset(new ui::DummyInputMethod); | 77 test_input_method_.reset(new ui::DummyInputMethod); |
78 root_window()->SetProperty( | 78 root_window()->SetProperty( |
79 client::kRootWindowInputMethodKey, | 79 client::kRootWindowInputMethodKey, |
80 test_input_method_.get()); | 80 test_input_method_.get()); |
81 | 81 |
82 root_window()->Show(); | 82 root_window()->Show(); |
83 // Ensure width != height so tests won't confuse them. | 83 // Ensure width != height so tests won't confuse them. |
84 dispatcher()->host()->SetBounds(gfx::Rect(800, 600)); | 84 host()->SetBounds(gfx::Rect(800, 600)); |
85 } | 85 } |
86 | 86 |
87 void AuraTestHelper::TearDown() { | 87 void AuraTestHelper::TearDown() { |
88 teardown_called_ = true; | 88 teardown_called_ = true; |
89 test_input_method_.reset(); | 89 test_input_method_.reset(); |
90 stacking_client_.reset(); | 90 stacking_client_.reset(); |
91 activation_client_.reset(); | 91 activation_client_.reset(); |
92 capture_client_.reset(); | 92 capture_client_.reset(); |
93 focus_client_.reset(); | 93 focus_client_.reset(); |
94 client::SetFocusClient(root_window(), NULL); | 94 client::SetFocusClient(root_window(), NULL); |
(...skipping 13 matching lines...) Expand all Loading... |
108 | 108 |
109 void AuraTestHelper::RunAllPendingInMessageLoop() { | 109 void AuraTestHelper::RunAllPendingInMessageLoop() { |
110 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them | 110 // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them |
111 // use run_loop.QuitClosure(). | 111 // use run_loop.QuitClosure(). |
112 base::RunLoop run_loop; | 112 base::RunLoop run_loop; |
113 run_loop.RunUntilIdle(); | 113 run_loop.RunUntilIdle(); |
114 } | 114 } |
115 | 115 |
116 } // namespace test | 116 } // namespace test |
117 } // namespace aura | 117 } // namespace aura |
OLD | NEW |