diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 22:04:47 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 22:04:47 +0000 |
| commit | 1dd1c1bdf2effafeeb883c8318e5cf02404ac6b2 (patch) | |
| tree | 3e04b2dec007f582266c14a66e0470eae5a66d03 /ash/tooltips | |
| parent | 9e306c39f14c440f67c78c6d7890a754f9a7d226 (diff) | |
| download | chromium_src-1dd1c1bdf2effafeeb883c8318e5cf02404ac6b2.zip chromium_src-1dd1c1bdf2effafeeb883c8318e5cf02404ac6b2.tar.gz chromium_src-1dd1c1bdf2effafeeb883c8318e5cf02404ac6b2.tar.bz2 | |
A bevy of Aura test changes:
- renames aura_shell_test_base to ash_test_base
- AshTestBase no longer subclasses AuraTestBase, instead now it and AuraTestBase both own a helper that does common initialization. This is necessary because in subsequent changes ash::Shell will be responsible for creating and owning its own RootWindow, whereas Aura code could have N RootWindows.
- Makes ScreenAura take a RootWindow instead of using RootWindow::GetInstance()
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9425015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 3ab89fe..ff27e43 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "ash/shell.h" -#include "ash/test/aura_shell_test_base.h" +#include "ash/test/ash_test_base.h" #include "ash/tooltips/tooltip_controller.h" #include "base/utf_string_conversions.h" #include "ui/aura/client/tooltip_client.h" @@ -73,7 +73,7 @@ ash::internal::TooltipController* GetController() { } // namespace -class TooltipControllerTest : public AuraShellTestBase { +class TooltipControllerTest : public AshTestBase { public: TooltipControllerTest() {} virtual ~TooltipControllerTest() {} |