| 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 #ifndef ASH_TEST_ASH_TEST_BASE_H_ | 5 #ifndef ASH_TEST_ASH_TEST_BASE_H_ |
| 6 #define ASH_TEST_ASH_TEST_BASE_H_ | 6 #define ASH_TEST_ASH_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 virtual void TearDown() OVERRIDE; | 49 virtual void TearDown() OVERRIDE; |
| 50 | 50 |
| 51 // Change the primary display's configuration to use |bounds| | 51 // Change the primary display's configuration to use |bounds| |
| 52 // and |scale|. | 52 // and |scale|. |
| 53 void ChangeDisplayConfig(float scale, const gfx::Rect& bounds); | 53 void ChangeDisplayConfig(float scale, const gfx::Rect& bounds); |
| 54 | 54 |
| 55 // Update the display configuration as given in |display_specs|. | 55 // Update the display configuration as given in |display_specs|. |
| 56 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. | 56 // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. |
| 57 void UpdateDisplay(const std::string& display_specs); | 57 void UpdateDisplay(const std::string& display_specs); |
| 58 | 58 |
| 59 // Returns a RootWindow. Usually this is the active RootWindow, but that |
| 60 // method can return NULL sometimes, and in those cases, we fall back on the |
| 61 // primary RootWindow. |
| 62 aura::RootWindow* CurrentContext(); |
| 63 |
| 59 // Versions of the functions in aura::test:: that go through our shell | 64 // Versions of the functions in aura::test:: that go through our shell |
| 60 // StackingController instead of taking a parent. | 65 // StackingController instead of taking a parent. |
| 61 aura::Window* CreateTestWindowInShellWithId(int id); | 66 aura::Window* CreateTestWindowInShellWithId(int id); |
| 62 aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds); | 67 aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds); |
| 63 aura::Window* CreateTestWindowInShell(SkColor color, | 68 aura::Window* CreateTestWindowInShell(SkColor color, |
| 64 int id, | 69 int id, |
| 65 const gfx::Rect& bounds); | 70 const gfx::Rect& bounds); |
| 66 aura::Window* CreateTestWindowInShellWithDelegate( | 71 aura::Window* CreateTestWindowInShellWithDelegate( |
| 67 aura::WindowDelegate* delegate, | 72 aura::WindowDelegate* delegate, |
| 68 int id, | 73 int id, |
| (...skipping 21 matching lines...) Expand all Loading... |
| 90 | 95 |
| 91 TestShellDelegate* test_shell_delegate_; | 96 TestShellDelegate* test_shell_delegate_; |
| 92 | 97 |
| 93 DISALLOW_COPY_AND_ASSIGN(AshTestBase); | 98 DISALLOW_COPY_AND_ASSIGN(AshTestBase); |
| 94 }; | 99 }; |
| 95 | 100 |
| 96 } // namespace test | 101 } // namespace test |
| 97 } // namespace ash | 102 } // namespace ash |
| 98 | 103 |
| 99 #endif // ASH_TEST_ASH_TEST_BASE_H_ | 104 #endif // ASH_TEST_ASH_TEST_BASE_H_ |
| OLD | NEW |