OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef UI_AURA_TEST_TEST_UTILS_H_ | 5 #ifndef UI_AURA_TEST_TEST_UTILS_H_ |
6 #define UI_AURA_TEST_TEST_UTILS_H_ | 6 #define UI_AURA_TEST_TEST_UTILS_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "third_party/skia/include/core/SkColor.h" | 10 #include "third_party/skia/include/core/SkColor.h" |
11 #include "ui/aura/test/test_window_delegate.h" | 11 #include "ui/aura/test/test_window_delegate.h" |
12 #include "ui/aura/test/aura_test_base.h" | 12 #include "ui/aura/test/aura_test_base.h" |
| 13 #include "ui/aura/window_types.h" |
13 | 14 |
14 namespace gfx { | 15 namespace gfx { |
15 class Canvas; | 16 class Canvas; |
16 } | 17 } |
17 | 18 |
18 namespace aura { | 19 namespace aura { |
19 namespace test { | 20 namespace test { |
20 | 21 |
21 Window* CreateTestWindowWithId(int id, Window* parent); | 22 Window* CreateTestWindowWithId(int id, Window* parent); |
22 Window* CreateTestWindowWithBounds(const gfx::Rect& bounds, Window* parent); | 23 Window* CreateTestWindowWithBounds(const gfx::Rect& bounds, Window* parent); |
23 Window* CreateTestWindow(SkColor color, | 24 Window* CreateTestWindow(SkColor color, |
24 int id, | 25 int id, |
25 const gfx::Rect& bounds, | 26 const gfx::Rect& bounds, |
26 Window* parent); | 27 Window* parent); |
27 Window* CreateTestWindowWithDelegate(WindowDelegate* delegate, | 28 Window* CreateTestWindowWithDelegate(WindowDelegate* delegate, |
28 int id, | 29 int id, |
29 const gfx::Rect& bounds, | 30 const gfx::Rect& bounds, |
30 Window* parent); | 31 Window* parent); |
| 32 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate, |
| 33 WindowType type, |
| 34 int id, |
| 35 const gfx::Rect& bounds, |
| 36 Window* parent); |
31 | 37 |
32 } // namespace test | 38 } // namespace test |
33 } // namespace aura | 39 } // namespace aura |
34 | 40 |
35 #endif // UI_AURA_TEST_TEST_UTILS_H_ | 41 #endif // UI_AURA_TEST_TEST_UTILS_H_ |
OLD | NEW |