summaryrefslogtreecommitdiffstats
path: root/athena/wm
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-14 05:15:01 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-14 05:16:34 +0000
commit5b3dc24a11aa5386d567a6363e97433c2a152117 (patch)
tree5e0ca7db156650c2842d725e7e96f0d6817191d2 /athena/wm
parent71ea825963655f8fd3eee7e3d20bdff054c707d0 (diff)
downloadchromium_src-5b3dc24a11aa5386d567a6363e97433c2a152117.zip
chromium_src-5b3dc24a11aa5386d567a6363e97433c2a152117.tar.gz
chromium_src-5b3dc24a11aa5386d567a6363e97433c2a152117.tar.bz2
athena: Fix a use-after-free case.
|split_view_controller_| depends on |mru_window_tracker_|. So destroy them in the correct order to avoid the use-after-free when destroying the window manager. BUG=none TBR=mfomitchev@chromium.org, oshima@chromium.org Review URL: https://codereview.chromium.org/471803002 Cr-Commit-Position: refs/heads/master@{#289464} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/wm')
-rw-r--r--athena/wm/window_manager_impl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc
index 4d75263..f124311 100644
--- a/athena/wm/window_manager_impl.cc
+++ b/athena/wm/window_manager_impl.cc
@@ -135,6 +135,7 @@ WindowManagerImpl::WindowManagerImpl() {
WindowManagerImpl::~WindowManagerImpl() {
overview_.reset();
+ split_view_controller_.reset();
mru_window_tracker_.reset();
if (container_) {
container_->RemoveObserver(this);