diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 23:58:10 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-29 23:58:10 +0000 |
| commit | 956a6a43424ba559af697d6548979c0523a615e5 (patch) | |
| tree | b20ebcbf4420cfb8ee737eae052b1c23b6305377 /ash/root_window_controller.cc | |
| parent | 5c1867d21e30cafa560ed42336598c3d51d16f32 (diff) | |
| download | chromium_src-956a6a43424ba559af697d6548979c0523a615e5.zip chromium_src-956a6a43424ba559af697d6548979c0523a615e5.tar.gz chromium_src-956a6a43424ba559af697d6548979c0523a615e5.tar.bz2 | |
Reset the system background before root window is released.
The system background is observing the root and has to deregister itself before the root's release.
BUG=None
TEST=valgrind doesn't report the memory error in ash_unittests for this.
Review URL: https://codereview.chromium.org/11345018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 2c00a5b..a8445e4 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -187,6 +187,8 @@ void RootWindowController::Shutdown() { // And this root window should no longer process events. root_window_->PrepareForShutdown(); + system_background_.reset(); + // Launcher widget has an InputMethodBridge that references to // |input_method_filter_|'s |input_method_|. So explicitly release // |launcher_| before |input_method_filter_|. And this needs to be |