OLD | NEW |
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 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
755 // Even in case when following online,offline protocol and returning | 755 // Even in case when following online,offline protocol and returning |
756 // requests_pending = false, let LoginPerformer delete itself. | 756 // requests_pending = false, let LoginPerformer delete itself. |
757 login_performer_->set_delegate(NULL); | 757 login_performer_->set_delegate(NULL); |
758 ignore_result(login_performer_.release()); | 758 ignore_result(login_performer_.release()); |
759 | 759 |
760 // Will call OnProfilePrepared() in the end. | 760 // Will call OnProfilePrepared() in the end. |
761 LoginUtils::Get()->PrepareProfile(user_context, | 761 LoginUtils::Get()->PrepareProfile(user_context, |
762 display_email_, | 762 display_email_, |
763 using_oauth, | 763 using_oauth, |
764 has_cookies, | 764 has_cookies, |
| 765 false, // Start session for user. |
765 this); | 766 this); |
766 | 767 |
767 display_email_.clear(); | 768 display_email_.clear(); |
768 | 769 |
769 // Notify LoginDisplay to allow it provide visual feedback to user. | 770 // Notify LoginDisplay to allow it provide visual feedback to user. |
770 login_display_->OnLoginSuccess(user_context.username); | 771 login_display_->OnLoginSuccess(user_context.username); |
771 } | 772 } |
772 | 773 |
773 void ExistingUserController::OnProfilePrepared(Profile* profile) { | 774 void ExistingUserController::OnProfilePrepared(Profile* profile) { |
774 OptionallyShowReleaseNotes(profile); | 775 OptionallyShowReleaseNotes(profile); |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1120 // changed. | 1121 // changed. |
1121 UserManager::Get()->SaveUserOAuthStatus( | 1122 UserManager::Get()->SaveUserOAuthStatus( |
1122 username, | 1123 username, |
1123 User::OAUTH2_TOKEN_STATUS_INVALID); | 1124 User::OAUTH2_TOKEN_STATUS_INVALID); |
1124 | 1125 |
1125 login_display_->SetUIEnabled(true); | 1126 login_display_->SetUIEnabled(true); |
1126 login_display_->ShowGaiaPasswordChanged(username); | 1127 login_display_->ShowGaiaPasswordChanged(username); |
1127 } | 1128 } |
1128 | 1129 |
1129 } // namespace chromeos | 1130 } // namespace chromeos |
OLD | NEW |