Commit b0b21120 authored by dhollowa@chromium.org's avatar dhollowa@chromium.org

Aura Shell singleton needs to be destroyed prior to the Aura Desktop

Adds code to explicitly destroy the Aura Shell class prior to the destruction of Aura Desktop.  The reason for this is that the Shell leaks the DesktopFilter event listeners otherwise and DCHECKs fire.

Note, this currently only affects the Mac port because other platforms exit() from the run loop and don't do explicit tear-down.

BUG=none
TEST=Manually run aura_shell_exe on Mac.
R=sky@chromium.org, xiyuan@chromium.org

Review URL: http://codereview.chromium.org/8824017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113415 0039d316-1c4b-4281-b951-d872f2087c98
parent d0298008
......@@ -123,6 +123,8 @@ int main(int argc, char** argv) {
aura::RootWindow::GetInstance()->Run();
aura_shell::Shell::DeleteInstance();
aura::RootWindow::DeleteInstance();
ui::CompositorTestSupport::Terminate();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment