diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 08:12:24 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 08:12:24 +0000 |
| commit | 3a2c22dcd719dbfcebc483987f6eb2364eb9ffbc (patch) | |
| tree | 768d4e1e32a5a3ff9005c14fa1bc3875a61caa8d | |
| parent | 4c2f0d5cbb9d3a59b759578b3771ce0e218b89ee (diff) | |
| download | chromium_src-3a2c22dcd719dbfcebc483987f6eb2364eb9ffbc.zip chromium_src-3a2c22dcd719dbfcebc483987f6eb2364eb9ffbc.tar.gz chromium_src-3a2c22dcd719dbfcebc483987f6eb2364eb9ffbc.tar.bz2 | |
Fix ChromeOS debug buildbot failure.
Triggering ownership check on key load failure creates an infinite loop when
owner key file is missing.
BUG=none
TEST=ChromeOS debug buildbot should be green.
TBR=cmasone@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58331 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/user_manager.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index 381297a..3336622 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -256,8 +256,6 @@ UserManager::UserManager() current_user_is_owner_(false) { registrar_.Add(this, NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED, NotificationService::AllSources()); - registrar_.Add(this, NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED, - NotificationService::AllSources()); } UserManager::~UserManager() { @@ -286,8 +284,7 @@ void UserManager::NotifyOnLogin() { void UserManager::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED || - type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_FAILED) { + if (type == NotificationType::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) { ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, NewRunnableFunction(&CheckOwnership)); } |