Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3990)

Unified Diff: chrome/browser/chromeos/login/login_performer.cc

Issue 9558012: Cleanup: IWYU for BrowserThread. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/extensions/extension_process_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_performer.cc
===================================================================
--- chrome/browser/chromeos/login/login_performer.cc (revision 124292)
+++ chrome/browser/chromeos/login/login_performer.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/metrics/histogram.h"
+#include "base/threading/thread_restrictions.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/boot_times_loader.h"
@@ -418,24 +419,24 @@
void LoginPerformer::ResolveLockLoginFailure() {
if (last_login_failure_.reason() == LoginFailure::LOGIN_TIMED_OUT) {
- LOG(WARNING) << "Online login timed out - unlocking screen. "
- << "Granting user access based on offline auth only.";
- RequestScreenUnlock();
- return;
- } else if (last_login_failure_.reason() ==
- LoginFailure::NETWORK_AUTH_FAILED) {
- ResolveLockNetworkAuthFailure();
- return;
- } else if (last_login_failure_.reason() ==
- LoginFailure::COULD_NOT_MOUNT_CRYPTOHOME ||
- last_login_failure_.reason() ==
- LoginFailure::DATA_REMOVAL_FAILED) {
- LOG(ERROR) << "Cryptohome error, forcing sign out.";
- } else {
- // COULD_NOT_MOUNT_TMPFS, UNLOCK_FAILED should not happen here.
- NOTREACHED();
- }
- ScreenLocker::default_screen_locker()->Signout();
+ LOG(WARNING) << "Online login timed out - unlocking screen. "
+ << "Granting user access based on offline auth only.";
+ RequestScreenUnlock();
+ return;
+ } else if (last_login_failure_.reason() ==
+ LoginFailure::NETWORK_AUTH_FAILED) {
+ ResolveLockNetworkAuthFailure();
+ return;
+ } else if (last_login_failure_.reason() ==
+ LoginFailure::COULD_NOT_MOUNT_CRYPTOHOME ||
+ last_login_failure_.reason() ==
+ LoginFailure::DATA_REMOVAL_FAILED) {
+ LOG(ERROR) << "Cryptohome error, forcing sign out.";
+ } else {
+ // COULD_NOT_MOUNT_TMPFS, UNLOCK_FAILED should not happen here.
+ NOTREACHED();
+ }
+ ScreenLocker::default_screen_locker()->Signout();
}
void LoginPerformer::ResolveLockNetworkAuthFailure() {
« no previous file with comments | « chrome/browser/browsing_data_remover.h ('k') | chrome/browser/extensions/extension_process_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698