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

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: Fix browser tests 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 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 } 1306 }
1307 1307
1308 PerformPreLoginActions(user_context); 1308 PerformPreLoginActions(user_context);
1309 1309
1310 if (!time_init_.is_null()) { 1310 if (!time_init_.is_null()) {
1311 base::TimeDelta delta = base::Time::Now() - time_init_; 1311 base::TimeDelta delta = base::Time::Now() - time_init_;
1312 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta); 1312 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta);
1313 time_init_ = base::Time(); // Reset to null. 1313 time_init_ = base::Time(); // Reset to null.
1314 } 1314 }
1315 1315
1316 host_->OnCompleteLogin();
1317
1318 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) { 1316 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) {
1319 bootstrap_user_context_initializer_.reset( 1317 bootstrap_user_context_initializer_.reset(
1320 new BootstrapUserContextInitializer()); 1318 new BootstrapUserContextInitializer());
1321 bootstrap_user_context_initializer_->Start( 1319 bootstrap_user_context_initializer_->Start(
1322 user_context.GetAuthCode(), 1320 user_context.GetAuthCode(),
1323 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized, 1321 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized,
1324 weak_factory_.GetWeakPtr())); 1322 weak_factory_.GetWeakPtr()));
1325 return; 1323 return;
1326 } 1324 }
1327 1325
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); 1433 login_display_->ShowUnrecoverableCrypthomeErrorDialog();
1436 } 1434 }
1437 1435
1438 void ExistingUserController::ClearRecordedNames() { 1436 void ExistingUserController::ClearRecordedNames() {
1439 display_email_.clear(); 1437 display_email_.clear();
1440 display_name_.clear(); 1438 display_name_.clear();
1441 given_name_.clear(); 1439 given_name_.clear();
1442 } 1440 }
1443 1441
1444 } // namespace chromeos 1442 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698