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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/login_performer.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
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/login_performer.h" 5 #include "chrome/browser/chromeos/login/login_performer.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 authentication->SchedulePasswordMigration(user_context.username, 224 authentication->SchedulePasswordMigration(user_context.username,
225 user_context.password, 225 user_context.password,
226 new_flow); 226 new_flow);
227 } 227 }
228 228
229 UserContext user_context_copy( 229 UserContext user_context_copy(
230 user_context.username, 230 user_context.username,
231 user_context.password, 231 user_context.password,
232 user_context.auth_code, 232 user_context.auth_code,
233 user_context.username_hash, 233 user_context.username_hash,
234 user_context.using_oauth, 234 user_context.using_oauth);
235 user_context.auth_flow);
236 235
237 user_context_copy.password = authentication->TransformPassword( 236 user_context_copy.password = authentication->TransformPassword(
238 user_context_copy.username, 237 user_context_copy.username,
239 user_context_copy.password); 238 user_context_copy.password);
240 239
241 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); 240 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
242 BrowserThread::PostTask( 241 BrowserThread::PostTask(
243 BrowserThread::UI, FROM_HERE, 242 BrowserThread::UI, FROM_HERE,
244 base::Bind(&Authenticator::LoginAsLocallyManagedUser, 243 base::Bind(&Authenticator::LoginAsLocallyManagedUser,
245 authenticator_.get(), 244 authenticator_.get(),
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // state in the case when offline login fails. 334 // state in the case when offline login fails.
336 online_attempt_host_.Check(profile, user_context_); 335 online_attempt_host_.Check(profile, user_context_);
337 } else { 336 } else {
338 NOTREACHED(); 337 NOTREACHED();
339 } 338 }
340 user_context_.password.clear(); 339 user_context_.password.clear();
341 user_context_.auth_code.clear(); 340 user_context_.auth_code.clear();
342 } 341 }
343 342
344 } // namespace chromeos 343 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698