diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 11:56:56 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 11:56:56 +0000 |
| commit | 6d28f062185a78498530c21733b934f7df8f5e4b (patch) | |
| tree | 063556e7d4516c6239d616804a0dfcfbe947b7a8 | |
| parent | a162b60effc682224da9d148d71cc360cd1f3ddd (diff) | |
| download | chromium_src-6d28f062185a78498530c21733b934f7df8f5e4b.zip chromium_src-6d28f062185a78498530c21733b934f7df8f5e4b.tar.gz chromium_src-6d28f062185a78498530c21733b934f7df8f5e4b.tar.bz2 | |
[cros] Use new Authenticator instance for Screen Lock.
For reference, original CL that ads authenticator profile usage - http://codereview.chromium.org/7397007/
BUG=chromium-os:17979
TEST=Locked screen multiple times, no crash.
Review URL: http://codereview.chromium.org/7474015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94656 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index ce93999..37bbf10 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -33,6 +33,7 @@ #include "chrome/browser/chromeos/login/login_display_host.h" #include "chrome/browser/chromeos/login/ownership_service.h" #include "chrome/browser/chromeos/login/parallel_authenticator.h" +#include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/net/chrome_url_request_context.h" @@ -703,6 +704,10 @@ void LoginUtilsImpl::SetFirstLoginPrefs(PrefService* prefs) { Authenticator* LoginUtilsImpl::CreateAuthenticator( LoginStatusConsumer* consumer) { + // Screen locker needs new Authenticator instance each time. + if (ScreenLocker::default_screen_locker()) + authenticator_ = NULL; + if (authenticator_ == NULL) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kParallelAuth)) authenticator_ = new ParallelAuthenticator(consumer); |