diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:13:27 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 22:13:27 +0000 |
| commit | 9661035442518ea3fc5cefe2e9439fee8b735fc4 (patch) | |
| tree | 5b64e8c05556aaa061742f3ed7117477221edba1 /ash/test/ash_test_helper.cc | |
| parent | 75746b4b91172882cdaf1cc956147317627ad231 (diff) | |
| download | chromium_src-9661035442518ea3fc5cefe2e9439fee8b735fc4.zip chromium_src-9661035442518ea3fc5cefe2e9439fee8b735fc4.tar.gz chromium_src-9661035442518ea3fc5cefe2e9439fee8b735fc4.tar.bz2 | |
Moves transient stacking logic into WindowStackingClient
This is part of moving transient window logic out of Window.
BUG=none
TEST=covered by tests
R=ben@chromium.org
Review URL: https://codereview.chromium.org/103813006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 10ed2a2..6cff6ba 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -22,6 +22,7 @@ #include "ui/compositor/test/context_factories_for_test.h" #include "ui/message_center/message_center.h" #include "ui/views/corewm/capture_controller.h" +#include "ui/views/corewm/transient_window_stacking_client.h" #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" @@ -87,6 +88,10 @@ void AshTestHelper::SetUp(bool start_session) { test_screenshot_delegate_ = new TestScreenshotDelegate(); shell->accelerator_controller()->SetScreenshotDelegate( scoped_ptr<ScreenshotDelegate>(test_screenshot_delegate_)); + + // SetWindowStackingClient() takes ownership of TransientWindowStackingClient. + aura::client::SetWindowStackingClient( + new views::corewm::TransientWindowStackingClient); } void AshTestHelper::TearDown() { @@ -111,6 +116,8 @@ void AshTestHelper::TearDown() { zero_duration_mode_.reset(); CHECK(!views::corewm::ScopedCaptureClient::IsActive()); + + aura::client::SetWindowStackingClient(NULL); } void AshTestHelper::RunAllPendingInMessageLoop() { |