diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 00:49:31 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 00:49:31 +0000 |
| commit | 69f8dc80be91b57af76374d858f06f52cb36eb07 (patch) | |
| tree | 217b33c9f29dc9d8fb7bff43be4e194720d17476 /ash/shell/shell_delegate_impl.cc | |
| parent | a94fe6a7fb8d6bd3a3dda6ff5cf5ac4abf88745e (diff) | |
| download | chromium_src-69f8dc80be91b57af76374d858f06f52cb36eb07.zip chromium_src-69f8dc80be91b57af76374d858f06f52cb36eb07.tar.gz chromium_src-69f8dc80be91b57af76374d858f06f52cb36eb07.tar.bz2 | |
Delete "shutdown without closing browsers"
Removing unused ShellDelegate::Shutdown()
Added new PreShutdown to safely cleanup DisplayObserver.
Chrome no longer access X during shutdown (except for deleting X window, which is safe), so normal SessionEnd
path should work.
There is another issue when this happens during login screen, and I'll file a separate bug for it.
BUG=336653
Review URL: https://codereview.chromium.org/205963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.cc')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index d21f7ac..4efd104 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -101,7 +101,7 @@ bool ShellDelegateImpl::IsRunningInForcedAppMode() const { void ShellDelegateImpl::PreInit() { } -void ShellDelegateImpl::Shutdown() { +void ShellDelegateImpl::PreShutdown() { } void ShellDelegateImpl::Exit() { |