diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 08:10:23 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 08:10:23 +0000 |
| commit | 2b71e5c33a61848db94f6acfaa3eeab1257744d0 (patch) | |
| tree | 9b014aa187678444b38dcd4f1b39038cdb8cf7fe /ui/aura/test | |
| parent | 44a034e03771e91cb04767fa388a3a8c1839b40b (diff) | |
| download | chromium_src-2b71e5c33a61848db94f6acfaa3eeab1257744d0.zip chromium_src-2b71e5c33a61848db94f6acfaa3eeab1257744d0.tar.gz chromium_src-2b71e5c33a61848db94f6acfaa3eeab1257744d0.tar.bz2 | |
Revert r114369 "Store StackingClient on RootWindow in a property."
This reverts commit da56a47ab4279016cd690e576bee1d81d414aac5.
TBR=ben@chromium.org
BUG=none
TEST=browser_tests should pass without crash
Review URL: http://codereview.chromium.org/8938015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/test')
| -rw-r--r-- | ui/aura/test/aura_test_base.cc | 3 | ||||
| -rw-r--r-- | ui/aura/test/test_stacking_client.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc index 7e05390..6ffbfb9 100644 --- a/ui/aura/test/aura_test_base.cc +++ b/ui/aura/test/aura_test_base.cc @@ -46,7 +46,8 @@ AuraTestBase::~AuraTestBase() { } TestStackingClient* AuraTestBase::GetTestStackingClient() { - return static_cast<TestStackingClient*>(StackingClient::GetStackingClient()); + return static_cast<TestStackingClient*>( + aura::RootWindow::GetInstance()->stacking_client()); } void AuraTestBase::SetUp() { diff --git a/ui/aura/test/test_stacking_client.cc b/ui/aura/test/test_stacking_client.cc index 2bc4ebe..18048f3 100644 --- a/ui/aura/test/test_stacking_client.cc +++ b/ui/aura/test/test_stacking_client.cc @@ -11,7 +11,7 @@ namespace test { TestStackingClient::TestStackingClient() : default_container_(new Window(NULL)) { - StackingClient::SetStackingClient(this); + RootWindow::GetInstance()->SetStackingClient(this); default_container_->Init(ui::Layer::LAYER_HAS_NO_TEXTURE); default_container_->SetBounds( gfx::Rect(gfx::Point(), RootWindow::GetInstance()->GetHostSize())); |