From 13ba9b2b46c0977d30fad57d96da1772c0cf67f1 Mon Sep 17 00:00:00 2001 From: oshima Date: Tue, 9 Sep 2014 19:44:32 -0700 Subject: Fix crash during shutdown * keep alive has to be incremented at startup. * exclude more code that depends on ash. * create a screen for shutdown Minor cleanup * remove all containers when ScreenManager is deleted. BUG=397167, 401044 TEST=AthenaShutdownTest.Shutdown Review URL: https://codereview.chromium.org/558823002 Cr-Commit-Position: refs/heads/master@{#294083} --- athena/screen/screen_manager_impl.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'athena/screen') diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc index c8395a7..0b9f67e 100644 --- a/athena/screen/screen_manager_impl.cc +++ b/athena/screen/screen_manager_impl.cc @@ -240,6 +240,13 @@ ScreenManagerImpl::~ScreenManagerImpl() { root_window_->RemovePreTargetHandler(focus_controller); aura::client::SetActivationClient(root_window_, NULL); aura::client::SetFocusClient(root_window_, NULL); + aura::Window::Windows children = root_window_->children(); + // Close All children: + for (aura::Window::Windows::iterator iter = children.begin(); + iter != children.end(); + ++iter) { + delete *iter; + } instance = NULL; } -- cgit v1.1