diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 00:02:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 00:02:59 +0000 |
| commit | 99f07e02767cdb5318a82c97c7974f0e8591c020 (patch) | |
| tree | b05202037f40de0cc455033dfe57c80f786ee65d /ui/aura/test/aura_test_base.cc | |
| parent | 56d7ad42237c35d2b7653c7cad89e9ca6ea75d68 (diff) | |
| download | chromium_src-99f07e02767cdb5318a82c97c7974f0e8591c020.zip chromium_src-99f07e02767cdb5318a82c97c7974f0e8591c020.tar.gz chromium_src-99f07e02767cdb5318a82c97c7974f0e8591c020.tar.bz2 | |
Rename Desktop->RootWindow.
BUG=none
TEST=compiles
TBR=sky
Review URL: http://codereview.chromium.org/8771015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test/aura_test_base.cc')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index bf180a1..6ffbfb9 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -8,7 +8,7 @@ #include <ole2.h> #endif -#include "ui/aura/desktop.h" +#include "ui/aura/root_window.h" #include "ui/aura/test/test_stacking_client.h" namespace aura { @@ -21,10 +21,10 @@ AuraTestBase::AuraTestBase() OleInitialize(NULL); #endif - // TestStackingClient is owned by the desktop. + // TestStackingClient is owned by the root window. new TestStackingClient(); - Desktop::GetInstance()->Show(); - Desktop::GetInstance()->SetHostSize(gfx::Size(600, 600)); + RootWindow::GetInstance()->Show(); + RootWindow::GetInstance()->SetHostSize(gfx::Size(600, 600)); } AuraTestBase::~AuraTestBase() { @@ -40,14 +40,14 @@ AuraTestBase::~AuraTestBase() { // and these tasks if un-executed would upset Valgrind. RunAllPendingInMessageLoop(); - // Ensure that we don't use the previously-allocated static Desktop object + // Ensure that we don't use the previously-allocated static RootWindow object // later -- on Linux, it holds a reference to our message loop's X connection. - aura::Desktop::DeleteInstance(); + aura::RootWindow::DeleteInstance(); } TestStackingClient* AuraTestBase::GetTestStackingClient() { return static_cast<TestStackingClient*>( - aura::Desktop::GetInstance()->stacking_client()); + aura::RootWindow::GetInstance()->stacking_client()); } void AuraTestBase::SetUp() { @@ -62,7 +62,7 @@ void AuraTestBase::TearDown() { void AuraTestBase::RunAllPendingInMessageLoop() { message_loop_.RunAllPendingWithDispatcher( - Desktop::GetInstance()->GetDispatcher()); + RootWindow::GetInstance()->GetDispatcher()); } } // namespace test |