Commit 5b3dc24a authored by sadrul@chromium.org's avatar sadrul@chromium.org

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
parent 71ea8259
...@@ -135,6 +135,7 @@ WindowManagerImpl::WindowManagerImpl() { ...@@ -135,6 +135,7 @@ WindowManagerImpl::WindowManagerImpl() {
WindowManagerImpl::~WindowManagerImpl() { WindowManagerImpl::~WindowManagerImpl() {
overview_.reset(); overview_.reset();
split_view_controller_.reset();
mru_window_tracker_.reset(); mru_window_tracker_.reset();
if (container_) { if (container_) {
container_->RemoveObserver(this); container_->RemoveObserver(this);
......
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