diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 15:29:16 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 15:29:16 +0000 |
| commit | 050e7718ca0a47182f7a478816c60686071357b8 (patch) | |
| tree | adf4851aab092da072c454bf8c4cd9d9a3fe83e4 /ash/test | |
| parent | f569a9c22c3df3c80ae5c05c2181f9ccc8067968 (diff) | |
| download | chromium_src-050e7718ca0a47182f7a478816c60686071357b8.zip chromium_src-050e7718ca0a47182f7a478816c60686071357b8.tar.gz chromium_src-050e7718ca0a47182f7a478816c60686071357b8.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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259061
R=abodenha@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/205963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 2 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 57c76cc..fe981d7 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -80,7 +80,7 @@ bool TestShellDelegate::IsRunningInForcedAppMode() const { void TestShellDelegate::PreInit() { } -void TestShellDelegate::Shutdown() { +void TestShellDelegate::PreShutdown() { } void TestShellDelegate::Exit() { diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index a41d1bb..9e610b6 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -35,7 +35,7 @@ class TestShellDelegate : public ShellDelegate { virtual bool IsMultiProfilesEnabled() const OVERRIDE; virtual bool IsRunningInForcedAppMode() const OVERRIDE; virtual void PreInit() OVERRIDE; - virtual void Shutdown() OVERRIDE; + virtual void PreShutdown() OVERRIDE; virtual void Exit() OVERRIDE; virtual keyboard::KeyboardControllerProxy* CreateKeyboardControllerProxy() OVERRIDE; |