diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 21:40:35 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-07 21:40:35 +0000 |
| commit | a2e6af1853d23b82a87b4ae6554424cc6e5393fb (patch) | |
| tree | ce0517e27e276e014f7cbec6ecc662c6f064a83d /ash/test/ash_test_base.h | |
| parent | 7a97aa864a3f602b4c032d3088df79528d69454f (diff) | |
| download | chromium_src-a2e6af1853d23b82a87b4ae6554424cc6e5393fb.zip chromium_src-a2e6af1853d23b82a87b4ae6554424cc6e5393fb.tar.gz chromium_src-a2e6af1853d23b82a87b4ae6554424cc6e5393fb.tar.bz2 | |
Continue threading context through unit tests.
- views_unittest now passes with the assert that checks that we have context.
- ash_unittest...is making progress towards that and this patch is already big.
BUG=161882
Review URL: https://codereview.chromium.org/11795004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_base.h')
| -rw-r--r-- | ash/test/ash_test_base.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h index 7a1c23b..40ae938 100644 --- a/ash/test/ash_test_base.h +++ b/ash/test/ash_test_base.h @@ -56,6 +56,11 @@ class AshTestBase : public testing::Test { // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details. void UpdateDisplay(const std::string& display_specs); + // Returns a RootWindow. Usually this is the active RootWindow, but that + // method can return NULL sometimes, and in those cases, we fall back on the + // primary RootWindow. + aura::RootWindow* CurrentContext(); + // Versions of the functions in aura::test:: that go through our shell // StackingController instead of taking a parent. aura::Window* CreateTestWindowInShellWithId(int id); |