| Index: ash/test/ash_test_base.h
|
| diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
|
| index deebefa6e0e527997701253212710e94a7e7b0bb..8445962044379f86a8536f0b7f3335401740274f 100644
|
| --- a/ash/test/ash_test_base.h
|
| +++ b/ash/test/ash_test_base.h
|
| @@ -68,6 +68,8 @@ class AshTestBase : public testing::Test {
|
|
|
| // Versions of the functions in aura::test:: that go through our shell
|
| // StackingController instead of taking a parent.
|
| + // TODO(tdanderson): Consider cleanup opportunities related to creation of
|
| + // test windows in aura and ash. See crbug.com/483503.
|
| aura::Window* CreateTestWindowInShellWithId(int id);
|
| aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds);
|
| aura::Window* CreateTestWindowInShell(SkColor color,
|
| @@ -82,6 +84,12 @@ class AshTestBase : public testing::Test {
|
| ui::wm::WindowType type,
|
| int id,
|
| const gfx::Rect& bounds);
|
| + aura::Window* CreateTestModalWindowInShellWithBounds(const gfx::Rect& bounds);
|
| + aura::Window* CreateTestModalWindowInShellWithDelegateAndType(
|
| + aura::WindowDelegate* delegate,
|
| + ui::wm::WindowType type,
|
| + int id,
|
| + const gfx::Rect& bounds);
|
|
|
| // Attach |window| to the current shell's root window.
|
| void ParentWindowInPrimaryRootWindow(aura::Window* window);
|
|
|