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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 666443002: Additional logging for crash mentioned in crbug.com/422918 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix merge Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 return; 439 return;
440 } 440 }
441 441
442 PerformPreLoginActions(user_context); 442 PerformPreLoginActions(user_context);
443 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL); 443 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL);
444 } 444 }
445 445
446 void ExistingUserController::PerformLogin( 446 void ExistingUserController::PerformLogin(
447 const UserContext& user_context, 447 const UserContext& user_context,
448 LoginPerformer::AuthorizationMode auth_mode) { 448 LoginPerformer::AuthorizationMode auth_mode) {
449 ChromeUserManager::Get()->GetUserFlow(user_context.GetUserID())->set_host( 449 // TODO(antrim): remove this output once crash reason is found.
450 host_); 450 LOG(ERROR) << "Setting flow from PerformLogin";
451 ChromeUserManager::Get()
452 ->GetUserFlow(user_context.GetUserID())
453 ->SetHost(host_);
451 454
452 BootTimesLoader::Get()->RecordLoginAttempted(); 455 BootTimesLoader::Get()->RecordLoginAttempted();
453 456
454 last_login_attempt_auth_flow_ = user_context.GetAuthFlow(); 457 last_login_attempt_auth_flow_ = user_context.GetAuthFlow();
455 458
456 // Use the same LoginPerformer for subsequent login as it has state 459 // Use the same LoginPerformer for subsequent login as it has state
457 // such as Authenticator instance. 460 // such as Authenticator instance.
458 if (!login_performer_.get() || num_login_attempts_ <= 1) { 461 if (!login_performer_.get() || num_login_attempts_ <= 1) {
459 // Only one instance of LoginPerformer should exist at a time. 462 // Only one instance of LoginPerformer should exist at a time.
460 login_performer_.reset(NULL); 463 login_performer_.reset(NULL);
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 is_login_in_progress_ = false; 1191 is_login_in_progress_ = false;
1189 1192
1190 // Reenable clicking on other windows and status area. 1193 // Reenable clicking on other windows and status area.
1191 login_display_->SetUIEnabled(true); 1194 login_display_->SetUIEnabled(true);
1192 1195
1193 if (start_public_session_timer) 1196 if (start_public_session_timer)
1194 StartPublicSessionAutoLoginTimer(); 1197 StartPublicSessionAutoLoginTimer();
1195 } 1198 }
1196 1199
1197 } // namespace chromeos 1200 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698