diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 20:34:43 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 20:34:43 +0000 |
| commit | 84c60ce1272afcfa8716817eb9061e1ef7132136 (patch) | |
| tree | 9a9a7852728dc80ec70b6d9f708f871dd6854d1b /ash/root_window_controller.cc | |
| parent | 74fb600c88a969b60e9d9727e0ab39f9e753e156 (diff) | |
| download | chromium_src-84c60ce1272afcfa8716817eb9061e1ef7132136.zip chromium_src-84c60ce1272afcfa8716817eb9061e1ef7132136.tar.gz chromium_src-84c60ce1272afcfa8716817eb9061e1ef7132136.tar.bz2 | |
Remove PrepareForShutdown
Filter events after shutdown in event filter instead.
BUG=None
Review URL: https://codereview.chromium.org/196573023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 3982ad7..ba8eb3f 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -354,8 +354,7 @@ void RootWindowController::Shutdown() { // ends up with invalid display. internal::GetRootWindowSettings(root_window())->display_id = gfx::Display::kInvalidDisplayID; - // And this root window should no longer process events. - host()->dispatcher()->PrepareForShutdown(); + internal::GetRootWindowSettings(root_window())->shutdown = true; system_background_.reset(); aura::client::SetScreenPositionClient(root_window(), NULL); |