diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 17:59:41 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 17:59:41 +0000 |
| commit | b0b2112088e2aab52a511cf80e3d18c575dd13c7 (patch) | |
| tree | cc25430bd0263fea934599ed29d4c28f3be689bd /ui | |
| parent | d0298008e96fe1d7b83271e075f71a705d0213a8 (diff) | |
| download | chromium_src-b0b2112088e2aab52a511cf80e3d18c575dd13c7.zip chromium_src-b0b2112088e2aab52a511cf80e3d18c575dd13c7.tar.gz chromium_src-b0b2112088e2aab52a511cf80e3d18c575dd13c7.tar.bz2 | |
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
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura_shell/examples/aura_shell_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/aura_shell/examples/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc index 8a8ee4c..d0429c9 100644 --- a/ui/aura_shell/examples/aura_shell_main.cc +++ b/ui/aura_shell/examples/aura_shell_main.cc @@ -123,6 +123,8 @@ int main(int argc, char** argv) { aura::RootWindow::GetInstance()->Run(); + aura_shell::Shell::DeleteInstance(); + aura::RootWindow::DeleteInstance(); ui::CompositorTestSupport::Terminate(); |