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

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

Issue 2771803003: Don't start FRE from the login screen (Closed)
Patch Set: Improve comments Created 3 years, 8 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
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 <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 } 1321 }
1322 1322
1323 PerformPreLoginActions(user_context); 1323 PerformPreLoginActions(user_context);
1324 1324
1325 if (!time_init_.is_null()) { 1325 if (!time_init_.is_null()) {
1326 base::TimeDelta delta = base::Time::Now() - time_init_; 1326 base::TimeDelta delta = base::Time::Now() - time_init_;
1327 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta); 1327 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta);
1328 time_init_ = base::Time(); // Reset to null. 1328 time_init_ = base::Time(); // Reset to null.
1329 } 1329 }
1330 1330
1331 host_->OnCompleteLogin();
1332
1333 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) { 1331 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) {
1334 bootstrap_user_context_initializer_.reset( 1332 bootstrap_user_context_initializer_.reset(
1335 new BootstrapUserContextInitializer()); 1333 new BootstrapUserContextInitializer());
1336 bootstrap_user_context_initializer_->Start( 1334 bootstrap_user_context_initializer_->Start(
1337 user_context.GetAuthCode(), 1335 user_context.GetAuthCode(),
1338 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized, 1336 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized,
1339 weak_factory_.GetWeakPtr())); 1337 weak_factory_.GetWeakPtr()));
1340 return; 1338 return;
1341 } 1339 }
1342 1340
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); 1448 login_display_->ShowUnrecoverableCrypthomeErrorDialog();
1451 } 1449 }
1452 1450
1453 void ExistingUserController::ClearRecordedNames() { 1451 void ExistingUserController::ClearRecordedNames() {
1454 display_email_.clear(); 1452 display_email_.clear();
1455 display_name_.clear(); 1453 display_name_.clear();
1456 given_name_.clear(); 1454 given_name_.clear();
1457 } 1455 }
1458 1456
1459 } // namespace chromeos 1457 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698