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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/parallel_authenticator.cc

Issue 137133007: Revert 246674 "Indicate which authentication flow was used in Us..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
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/parallel_authenticator.h" 5 #include "chrome/browser/chromeos/login/parallel_authenticator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 231
232 void ParallelAuthenticator::CompleteLogin(Profile* profile, 232 void ParallelAuthenticator::CompleteLogin(Profile* profile,
233 const UserContext& user_context) { 233 const UserContext& user_context) {
234 std::string canonicalized = gaia::CanonicalizeEmail(user_context.username); 234 std::string canonicalized = gaia::CanonicalizeEmail(user_context.username);
235 authentication_profile_ = profile; 235 authentication_profile_ = profile;
236 current_state_.reset( 236 current_state_.reset(
237 new AuthAttemptState( 237 new AuthAttemptState(
238 UserContext(canonicalized, 238 UserContext(canonicalized,
239 user_context.password, 239 user_context.password,
240 user_context.auth_code, 240 user_context.auth_code),
241 user_context.username_hash,
242 user_context.using_oauth,
243 user_context.auth_flow),
244 !UserManager::Get()->IsKnownUser(canonicalized))); 241 !UserManager::Get()->IsKnownUser(canonicalized)));
245 242
246 // Reset the verified flag. 243 // Reset the verified flag.
247 owner_is_verified_ = false; 244 owner_is_verified_ = false;
248 245
249 SystemSaltGetter::Get()->GetSystemSalt( 246 SystemSaltGetter::Get()->GetSystemSalt(
250 base::Bind(&Mount, 247 base::Bind(&Mount,
251 current_state_.get(), 248 current_state_.get(),
252 scoped_refptr<ParallelAuthenticator>(this), 249 scoped_refptr<ParallelAuthenticator>(this),
253 cryptohome::MOUNT_FLAGS_NONE)); 250 cryptohome::MOUNT_FLAGS_NONE));
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 Resolve(); 803 Resolve();
807 } 804 }
808 805
809 void ParallelAuthenticator::SetOwnerState(bool owner_check_finished, 806 void ParallelAuthenticator::SetOwnerState(bool owner_check_finished,
810 bool check_result) { 807 bool check_result) {
811 owner_is_verified_ = owner_check_finished; 808 owner_is_verified_ = owner_check_finished;
812 user_can_login_ = check_result; 809 user_can_login_ = check_result;
813 } 810 }
814 811
815 } // namespace chromeos 812 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698